From 29ecbd8043f3f0f06940bb0f389236de9c83f36f Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2019 05:35:18 +0000
Subject: [PATCH 01/22] Generated from 368b5914a375e09ef413285c932b72038a8af7e4
 (#4731)

fix: sql preview model validation errors

- Remove empty "body" for RESPONSE_SCHEMA_NOT_IN_SPEC errors
- IsAzureMonitorTargetEnabled -> isAzureMonitorTargetEnabled
- "State" -> "state"
- emailAccountAdmins "true" -> true
- Add 202 response for RestorePoints_Create
- password -> certPassword for ManagedInstanceTdeCertificates_Create and TdeCertificates_Create
---
 .../v2017_10_01_preview/pom.xml               |   4 +-
 .../sql/v2017_10_01_preview/Database.java     |  71 +++-
 .../v2017_10_01_preview/DatabaseStatus.java   |   6 +
 .../v2017_10_01_preview/DatabaseUpdate.java   |  59 ++-
 .../sql/v2017_10_01_preview/ElasticPool.java  |   6 +-
 .../RecoverableManagedDatabase.java           |  42 ++
 .../RecoverableManagedDatabases.java          |  40 ++
 .../implementation/DatabaseImpl.java          |  30 ++
 .../implementation/DatabaseInner.java         |  92 +++-
 ...lnerabilityAssessmentRuleBaselineImpl.java |   4 +-
 .../implementation/ElasticPoolInner.java      |  23 +-
 ...nerabilityAssessmentRuleBaselinesImpl.java |   3 +-
 .../RecoverableManagedDatabaseImpl.java       |  63 +++
 .../RecoverableManagedDatabaseInner.java      |  35 ++
 .../RecoverableManagedDatabasesImpl.java      |  65 +++
 .../RecoverableManagedDatabasesInner.java     | 401 ++++++++++++++++++
 .../SqlManagementClientImpl.java              |  14 +
 .../implementation/SqlManager.java            |  12 +
 18 files changed, 950 insertions(+), 20 deletions(-)
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java

diff --git a/sql/resource-manager/v2017_10_01_preview/pom.xml b/sql/resource-manager/v2017_10_01_preview/pom.xml
index db97895f8b5c..99b5452880c0 100644
--- a/sql/resource-manager/v2017_10_01_preview/pom.xml
+++ b/sql/resource-manager/v2017_10_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
index 966ec7467b22..1032f3897e2b 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
@@ -25,6 +25,11 @@
  * Type representing Database.
  */
 public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<SqlManager> {
+    /**
+     * @return the autoPauseDelay value.
+     */
+    Integer autoPauseDelay();
+
     /**
      * @return the catalogCollation value.
      */
@@ -120,6 +125,11 @@ public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshabl
      */
     Long maxSizeBytes();
 
+    /**
+     * @return the minCapacity value.
+     */
+    Double minCapacity();
+
     /**
      * @return the name value.
      */
@@ -236,6 +246,18 @@ interface WithLocation {
             WithCreate withLocation(String location);
         }
 
+        /**
+         * The stage of the database definition allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next definition stage
+             */
+            WithCreate withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database definition allowing to specify CatalogCollation.
          */
@@ -328,6 +350,18 @@ interface WithMaxSizeBytes {
             WithCreate withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database definition allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next definition stage
+             */
+            WithCreate withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database definition allowing to specify ReadScale.
          */
@@ -406,7 +440,14 @@ interface WithSampleName {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The name and tier of the SKU
+             * @param sku The database SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+ ```azurecli
+ az sql db list-editions -l &lt;location&gt; -o table
+ ````
+ ```powershell
+ Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
@@ -465,19 +506,31 @@ interface WithZoneRedundant {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<Database>, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
+        interface WithCreate extends Creatable<Database>, DefinitionStages.WithAutoPauseDelay, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithMinCapacity, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
         }
     }
     /**
      * The template for a Database update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Database>, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
+    interface Update extends Appliable<Database>, UpdateStages.WithAutoPauseDelay, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithMinCapacity, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
     }
 
     /**
      * Grouping of Database update stages.
      */
     interface UpdateStages {
+        /**
+         * The stage of the database update allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next update stage
+             */
+            Update withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database update allowing to specify CatalogCollation.
          */
@@ -570,6 +623,18 @@ interface WithMaxSizeBytes {
             Update withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database update allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next update stage
+             */
+            Update withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database update allowing to specify ReadScale.
          */
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
index 9f978f320c7d..3fb2f98287b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
@@ -70,6 +70,12 @@ public final class DatabaseStatus extends ExpandableStringEnum<DatabaseStatus> {
     /** Static value Scaling for DatabaseStatus. */
     public static final DatabaseStatus SCALING = fromString("Scaling");
 
+    /** Static value OfflineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus OFFLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OfflineChangingDwPerformanceTiers");
+
+    /** Static value OnlineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus ONLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OnlineChangingDwPerformanceTiers");
+
     /**
      * Creates or finds a DatabaseStatus from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
index eafe8ef45060..ac090462a514 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
@@ -106,7 +106,8 @@ public class DatabaseUpdate {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -237,6 +238,20 @@ public class DatabaseUpdate {
     @JsonProperty(value = "properties.currentSku", access = JsonProperty.Access.WRITE_ONLY)
     private Sku currentSku;
 
+    /**
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
     /**
      * Resource tags.
      */
@@ -400,7 +415,7 @@ public DatabaseUpdate withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -689,6 +704,46 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
     /**
      * Get resource tags.
      *
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
index c7b12d377c52..fa4d492b98f7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
@@ -172,7 +172,11 @@ interface WithPerDatabaseSettings {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku the sku parameter value
+             * @param sku The elastic pool SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+ ```azurecli
+ az sql elastic-pool list-editions -l &lt;location&gt; -o table
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
new file mode 100644
index 000000000000..eca31ea91304
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.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.sql.v2017_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabaseInner;
+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.sql.v2017_10_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing RecoverableManagedDatabase.
+ */
+public interface RecoverableManagedDatabase extends HasInner<RecoverableManagedDatabaseInner>, Indexable, Refreshable<RecoverableManagedDatabase>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the lastAvailableBackupDate value.
+     */
+    String lastAvailableBackupDate();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
new file mode 100644
index 000000000000..c73338b1d549
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.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.sql.v2017_10_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabasesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RecoverableManagedDatabases.
+ */
+public interface RecoverableManagedDatabases extends HasInner<RecoverableManagedDatabasesInner> {
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName);
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
index 57538e6de24c..821c2b33747f 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
@@ -101,6 +101,11 @@ private void resetCreateUpdateParameters() {
         this.updateParameter = new DatabaseUpdate();
     }
 
+    @Override
+    public Integer autoPauseDelay() {
+        return this.inner().autoPauseDelay();
+    }
+
     @Override
     public CatalogCollationType catalogCollation() {
         return this.inner().catalogCollation();
@@ -196,6 +201,11 @@ public Long maxSizeBytes() {
         return this.inner().maxSizeBytes();
     }
 
+    @Override
+    public Double minCapacity() {
+        return this.inner().minCapacity();
+    }
+
     @Override
     public String name() {
         return this.inner().name();
@@ -284,6 +294,16 @@ public DatabaseImpl withLocation(String location) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withAutoPauseDelay(Integer autoPauseDelay) {
+        if (isInCreateMode()) {
+            this.inner().withAutoPauseDelay(autoPauseDelay);
+        } else {
+            this.updateParameter.withAutoPauseDelay(autoPauseDelay);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withCatalogCollation(CatalogCollationType catalogCollation) {
         if (isInCreateMode()) {
@@ -354,6 +374,16 @@ public DatabaseImpl withMaxSizeBytes(Long maxSizeBytes) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withMinCapacity(Double minCapacity) {
+        if (isInCreateMode()) {
+            this.inner().withMinCapacity(minCapacity);
+        } else {
+            this.updateParameter.withMinCapacity(minCapacity);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withReadScale(DatabaseReadScale readScale) {
         if (isInCreateMode()) {
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
index 9c0e11f49b7f..d9598a583582 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
@@ -27,7 +27,20 @@
 @JsonFlatten
 public class DatabaseInner extends Resource {
     /**
-     * The name and tier of the SKU.
+     * The database SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -125,7 +138,8 @@ public class DatabaseInner extends Resource {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -257,7 +271,28 @@ public class DatabaseInner extends Resource {
     private Sku currentSku;
 
     /**
-     * Get the name and tier of the SKU.
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
+    /**
+     * Get the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @return the sku value
      */
@@ -266,7 +301,14 @@ public Sku sku() {
     }
 
     /**
-     * Set the name and tier of the SKU.
+     * Set the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @param sku the sku value to set
      * @return the DatabaseInner object itself.
@@ -431,7 +473,7 @@ public DatabaseInner withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -720,4 +762,44 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
 }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
index cdae43ef347f..7c4b03e3bda7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
@@ -29,7 +29,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(name, new DatabaseVulnerabilityAssessmentRuleBaselineInner());
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(name);
+        this.baselineName = name;
         //
     }
 
@@ -37,7 +37,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(inner.name());
+        this.baselineName = inner.name();
         // set resource ancestor and positional variables
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
index e7e1135945e9..d5a449ff60bd 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
@@ -23,7 +23,16 @@
 @JsonFlatten
 public class ElasticPoolInner extends Resource {
     /**
-     * The sku property.
+     * The elastic pool SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or the following command:
+     *
+     * ```azurecli
+     * az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -76,7 +85,11 @@ public class ElasticPoolInner extends Resource {
     private ElasticPoolLicenseType licenseType;
 
     /**
-     * Get the sku value.
+     * Get the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @return the sku value
      */
@@ -85,7 +98,11 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @param sku the sku value to set
      * @return the ElasticPoolInner object itself.
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
index 7b7f4ee69543..251a0a223bfc 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
@@ -11,7 +11,6 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedDatabaseVulnerabilityAssessmentRuleBaselines;
-import com.microsoft.azure.management.sql.v2017_10_01_preview.VulnerabilityAssessmentPolicyBaselineName;
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.DatabaseVulnerabilityAssessmentRuleBaseline;
@@ -47,7 +46,7 @@ private Observable<DatabaseVulnerabilityAssessmentRuleBaselineInner> getDatabase
         String managedInstanceName = IdParsingUtils.getValueFromIdByName(id, "managedInstances");
         String databaseName = IdParsingUtils.getValueFromIdByName(id, "databases");
         String ruleId = IdParsingUtils.getValueFromIdByName(id, "rules");
-        VulnerabilityAssessmentPolicyBaselineName baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
+        String baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
         ManagedDatabaseVulnerabilityAssessmentRuleBaselinesInner client = this.inner();
         return client.getAsync(resourceGroupName, managedInstanceName, databaseName, ruleId, baselineName);
     }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
new file mode 100644
index 000000000000..9dbd7757bdf5
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.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.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+
+class RecoverableManagedDatabaseImpl extends IndexableRefreshableWrapperImpl<RecoverableManagedDatabase, RecoverableManagedDatabaseInner> implements RecoverableManagedDatabase {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String recoverableDatabaseName;
+
+    RecoverableManagedDatabaseImpl(RecoverableManagedDatabaseInner inner,  SqlManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.recoverableDatabaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "recoverableDatabases");
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<RecoverableManagedDatabaseInner> getInnerAsync() {
+        RecoverableManagedDatabasesInner client = this.manager().inner().recoverableManagedDatabases();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.recoverableDatabaseName);
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String lastAvailableBackupDate() {
+        return this.inner().lastAvailableBackupDate();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
new file mode 100644
index 000000000000..08d0cf8784a1
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.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.sql.v2017_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A recoverable managed database resource.
+ */
+@JsonFlatten
+public class RecoverableManagedDatabaseInner extends ProxyResource {
+    /**
+     * The last available backup date.
+     */
+    @JsonProperty(value = "properties.lastAvailableBackupDate", access = JsonProperty.Access.WRITE_ONLY)
+    private String lastAvailableBackupDate;
+
+    /**
+     * Get the last available backup date.
+     *
+     * @return the lastAvailableBackupDate value
+     */
+    public String lastAvailableBackupDate() {
+        return this.lastAvailableBackupDate;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
new file mode 100644
index 000000000000..119953c77ec6
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+
+class RecoverableManagedDatabasesImpl extends WrapperImpl<RecoverableManagedDatabasesInner> implements RecoverableManagedDatabases {
+    private final SqlManager manager;
+
+    RecoverableManagedDatabasesImpl(SqlManager manager) {
+        super(manager.inner().recoverableManagedDatabases());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    private RecoverableManagedDatabaseImpl wrapModel(RecoverableManagedDatabaseInner inner) {
+        return  new RecoverableManagedDatabaseImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<RecoverableManagedDatabaseInner>, Iterable<RecoverableManagedDatabaseInner>>() {
+            @Override
+            public Iterable<RecoverableManagedDatabaseInner> call(Page<RecoverableManagedDatabaseInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName)
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
new file mode 100644
index 000000000000..741eb5979e22
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
@@ -0,0 +1,401 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.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 RecoverableManagedDatabases.
+ */
+public class RecoverableManagedDatabasesInner {
+    /** The Retrofit service to perform REST calls. */
+    private RecoverableManagedDatabasesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RecoverableManagedDatabasesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RecoverableManagedDatabasesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(RecoverableManagedDatabasesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RecoverableManagedDatabases to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RecoverableManagedDatabasesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases/{recoverableDatabaseName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("recoverableDatabaseName") String recoverableDatabaseName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName 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.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RecoverableManagedDatabaseInner object if successful.
+     */
+    public RecoverableManagedDatabaseInner get(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName, final ServiceCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName), serviceCallback);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).map(new Func1<ServiceResponse<RecoverableManagedDatabaseInner>, RecoverableManagedDatabaseInner>() {
+            @Override
+            public RecoverableManagedDatabaseInner call(ServiceResponse<RecoverableManagedDatabaseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (recoverableDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter recoverableDatabaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(resourceGroupName, managedInstanceName, recoverableDatabaseName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RecoverableManagedDatabaseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RecoverableManagedDatabaseInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RecoverableManagedDatabaseInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RecoverableManagedDatabaseInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RecoverableManagedDatabaseInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<RecoverableManagedDatabaseInner>> serviceFuture, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextSinglePageAsync(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.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
index d32e61c6610d..ad2a3c376e69 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
@@ -327,6 +327,19 @@ public ManagedInstanceEncryptionProtectorsInner managedInstanceEncryptionProtect
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * The RecoverableManagedDatabasesInner object to access its operations.
+     */
+    private RecoverableManagedDatabasesInner recoverableManagedDatabases;
+
+    /**
+     * Gets the RecoverableManagedDatabasesInner object to access its operations.
+     * @return the RecoverableManagedDatabasesInner object.
+     */
+    public RecoverableManagedDatabasesInner recoverableManagedDatabases() {
+        return this.recoverableManagedDatabases;
+    }
+
     /**
      * Initializes an instance of SqlManagementClient client.
      *
@@ -377,6 +390,7 @@ protected void initialize() {
         this.managedInstanceTdeCertificates = new ManagedInstanceTdeCertificatesInner(restClient().retrofit(), this);
         this.managedInstanceKeys = new ManagedInstanceKeysInner(restClient().retrofit(), this);
         this.managedInstanceEncryptionProtectors = new ManagedInstanceEncryptionProtectorsInner(restClient().retrofit(), this);
+        this.recoverableManagedDatabases = new RecoverableManagedDatabasesInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
     }
 
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
index f76a2962112b..aeddeb2596b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
@@ -31,6 +31,7 @@
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceTdeCertificates;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
@@ -53,6 +54,7 @@ public final class SqlManager extends ManagerCore<SqlManager, SqlManagementClien
     private ManagedInstanceTdeCertificates managedInstanceTdeCertificates;
     private ManagedInstanceKeys managedInstanceKeys;
     private ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors;
+    private RecoverableManagedDatabases recoverableManagedDatabases;
     /**
     * Get a Configurable instance that can be used to create SqlManager with optional configuration.
     *
@@ -250,6 +252,16 @@ public ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors()
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * @return Entry point to manage RecoverableManagedDatabases.
+     */
+    public RecoverableManagedDatabases recoverableManagedDatabases() {
+        if (this.recoverableManagedDatabases == null) {
+            this.recoverableManagedDatabases = new RecoverableManagedDatabasesImpl(this);
+        }
+        return this.recoverableManagedDatabases;
+    }
+
     /**
     * The implementation for Configurable interface.
     */

From d36437236a4a136ec05e830a8a61f376dfc82080 Mon Sep 17 00:00:00 2001
From: Phoenix He <tih@microsoft.com>
Date: Wed, 14 Aug 2019 11:22:46 +0800
Subject: [PATCH 02/22] add pull config

---
 .github/pull.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .github/pull.yml

diff --git a/.github/pull.yml b/.github/pull.yml
new file mode 100644
index 000000000000..cba38338ca1b
--- /dev/null
+++ b/.github/pull.yml
@@ -0,0 +1,7 @@
+# https://github.com/wei/pull#advanced-setup-with-config
+version: "1"
+rules:
+  - base: master
+    upstream: Azure:master
+    mergeMethod: rebase
+label: "AutoPull"

From 81b0d20d1a1ae6133d4a8d47706a642c5ac5f648 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Tue, 13 Aug 2019 21:15:38 -0700
Subject: [PATCH 03/22] Optimize checkout (#4982)

* Explicit checkout on build step to test.

* Adding checkout steps to test and analyze.
---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 06ce79cd972c..8d62e550fc7b 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -56,6 +56,9 @@ jobs:
           JavaVersion: '1.11'
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+
       - script: |
           echo "##vso[build.addbuildtag]Scheduled"
         displayName: 'Tag scheduled builds'
@@ -87,6 +90,9 @@ jobs:
       vmImage: 'ubuntu-16.04'
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+        
       - task: UsePythonVersion@0
         displayName: 'Use Python 3.6'
         inputs:
@@ -222,6 +228,9 @@ jobs:
       vmImage: $(OSVmImage)
 
     steps:
+      - checkout: self
+        fetchDepth: 1
+        
       - template: ../steps/verify-agent-os.yml
         parameters:
           OSName: $(OSName)

From 3527f66e7b5c39621824351344337613c439d3b2 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Tue, 13 Aug 2019 22:02:39 -0700
Subject: [PATCH 04/22] Prep for splitting keyvault ci. (#4984)

---
 sdk/keyvault/ci.data.yml | 55 ++++++++++++++++++++++++++++++++++++++++
 sdk/keyvault/ci.yml      |  4 +++
 2 files changed, 59 insertions(+)
 create mode 100644 sdk/keyvault/ci.data.yml

diff --git a/sdk/keyvault/ci.data.yml b/sdk/keyvault/ci.data.yml
new file mode 100644
index 000000000000..9e4f39d24ea6
--- /dev/null
+++ b/sdk/keyvault/ci.data.yml
@@ -0,0 +1,55 @@
+# DO NOT EDIT THIS FILE
+# This file is generated automatically and any changes will be lost.
+
+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/keyvault/
+    exclude:
+      - sdk/keyvault/azure-keyvault
+
+pr:
+  branches:
+    include:
+      - master
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/keyvault/
+    exclude:
+      - sdk/keyvault/azure-keyvault
+
+
+stages:
+  - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+    parameters:
+      ServiceDirectory: keyvault
+      Artifacts:
+        - name: microsoft-azure-keyvault
+          safeName: microsoftazurekeyvault
+        - name: microsoft-azure-keyvault-complete
+          safeName: microsoftazurekeyvaultcomplete
+        - name: microsoft-azure-keyvault-core
+          safeName: microsoftazurekeyvaultcore
+        - name: microsoft-azure-keyvault-cryptography
+          safeName: microsoftazurekeyvaultcryptography
+        - name: microsoft-azure-keyvault-extensions
+          safeName: microsoftazurekeyvaultextensions
+        - name: microsoft-azure-keyvault-test
+          safeName: microsoftazurekeyvaulttest
+        - name: microsoft-azure-keyvault-webkey
+          safeName: microsoftazurekeyvaultwebkey
\ No newline at end of file
diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
index 717c64343987..e7f355a992a5 100644
--- a/sdk/keyvault/ci.yml
+++ b/sdk/keyvault/ci.yml
@@ -17,6 +17,8 @@ trigger:
   paths:
     include:
       - sdk/keyvault/
+    exclude:
+      - sdk/keyvault/microsoft-azure
 
 pr:
   branches:
@@ -28,6 +30,8 @@ pr:
   paths:
     include:
       - sdk/keyvault/
+    exclude:
+      - sdk/keyvault/microsoft-azure
 
 stages:
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml

From 8edbcd808806c2e41b10eeb108f29dd8584a93b7 Mon Sep 17 00:00:00 2001
From: Yaohai Zheng <yaozheng@microsoft.com>
Date: Wed, 14 Aug 2019 21:12:17 +0800
Subject: [PATCH 05/22] Datamigration: update package 2018-07-15-preview.
 (#4937)

---
 .../v2018_07_15_preview/pom.xml               |    4 +-
 .../AzureActiveDirectoryApp.java              |   95 ++
 .../v2018_07_15_preview/BackupFileInfo.java   |   97 ++
 .../v2018_07_15_preview/BackupFileStatus.java |   56 +
 .../v2018_07_15_preview/BackupSetInfo.java    |  281 ++++
 .../CheckOCIDriverTaskInput.java              |   43 +
 .../CheckOCIDriverTaskOutput.java             |   49 +
 .../CheckOCIDriverTaskProperties.java         |   63 +
 .../ConnectToMongoDbTaskProperties.java       |    2 +-
 .../ConnectToSourceMySqlTaskInput.java        |    6 +-
 .../ConnectToSourceMySqlTaskProperties.java   |    2 +-
 .../ConnectToSourceNonSqlTaskOutput.java      |    2 +-
 .../ConnectToSourceOracleSyncTaskInput.java   |   43 +
 .../ConnectToSourceOracleSyncTaskOutput.java  |   78 ++
 ...nnectToSourceOracleSyncTaskProperties.java |   63 +
 ...onnectToSourcePostgreSqlSyncTaskInput.java |   44 +
 ...nnectToSourcePostgreSqlSyncTaskOutput.java |   94 ++
 ...tToSourcePostgreSqlSyncTaskProperties.java |   64 +
 ...ctToSourceSqlServerSyncTaskProperties.java |    2 +-
 .../ConnectToSourceSqlServerTaskInput.java    |   53 +
 .../ConnectToSourceSqlServerTaskOutput.java   |    2 +-
 ...ourceSqlServerTaskOutputAgentJobLevel.java |    2 +-
 ...ourceSqlServerTaskOutputDatabaseLevel.java |    2 +-
 ...ToSourceSqlServerTaskOutputLoginLevel.java |    2 +-
 ...tToSourceSqlServerTaskOutputTaskLevel.java |    2 +-
 ...onnectToSourceSqlServerTaskProperties.java |    2 +-
 ...ToTargetAzureDbForMySqlTaskProperties.java |    2 +-
 ...rgetAzureDbForPostgreSqlSyncTaskInput.java |   70 +
 ...getAzureDbForPostgreSqlSyncTaskOutput.java |   94 ++
 ...zureDbForPostgreSqlSyncTaskProperties.java |   64 +
 ...acleAzureDbForPostgreSqlSyncTaskInput.java |   44 +
 ...cleAzureDbForPostgreSqlSyncTaskOutput.java |  105 ++
 ...qlSyncTaskOutputDatabaseSchemaMapItem.java |   72 +
 ...zureDbForPostgreSqlSyncTaskProperties.java |   65 +
 .../ConnectToTargetSqlDbTaskProperties.java   |    2 +-
 .../ConnectToTargetSqlMISyncTaskInput.java    |   72 +
 .../ConnectToTargetSqlMISyncTaskOutput.java   |   64 +
 ...onnectToTargetSqlMISyncTaskProperties.java |   64 +
 .../ConnectToTargetSqlMITaskInput.java        |   79 ++
 .../ConnectToTargetSqlMITaskProperties.java   |    2 +-
 ...ectToTargetSqlSqlDbSyncTaskProperties.java |    2 +-
 .../v2018_07_15_preview/ConnectionInfo.java   |   22 +-
 .../DatabaseMigrationState.java               |   65 +
 .../GetTdeCertificatesSqlTaskProperties.java  |    2 +-
 .../GetUserTablesOracleTaskInput.java         |   71 +
 .../GetUserTablesOracleTaskOutput.java        |   64 +
 .../GetUserTablesOracleTaskProperties.java    |   64 +
 .../GetUserTablesPostgreSqlTaskInput.java     |   71 +
 .../GetUserTablesPostgreSqlTaskOutput.java    |   64 +
 ...GetUserTablesPostgreSqlTaskProperties.java |   64 +
 .../GetUserTablesSqlSyncTaskProperties.java   |    2 +-
 .../GetUserTablesSqlTaskProperties.java       |    2 +-
 .../InstallOCIDriverTaskInput.java            |   43 +
 .../InstallOCIDriverTaskOutput.java           |   33 +
 .../InstallOCIDriverTaskProperties.java       |   63 +
 .../MiSqlConnectionInfo.java                  |   48 +
 .../MigrateMISyncCompleteCommandInput.java    |   44 +
 .../MigrateMISyncCompleteCommandOutput.java   |   45 +
 ...igrateMISyncCompleteCommandProperties.java |   64 +
 .../MigrateMongoDbTaskProperties.java         |    2 +-
 ...MySqlAzureDbForMySqlSyncDatabaseInput.java |   79 ++
 ...ateMySqlAzureDbForMySqlSyncTaskOutput.java |    2 +-
 ...DbForMySqlSyncTaskOutputDatabaseError.java |    2 +-
 ...DbForMySqlSyncTaskOutputDatabaseLevel.java |    2 +-
 ...SqlAzureDbForMySqlSyncTaskOutputError.java |    2 +-
 ...bForMySqlSyncTaskOutputMigrationLevel.java |    2 +-
 ...ureDbForMySqlSyncTaskOutputTableLevel.java |    2 +-
 ...ySqlAzureDbForMySqlSyncTaskProperties.java |    2 +-
 ...zureDbForPostgreSqlSyncTaskProperties.java |   64 +
 ...cleAzureDbPostgreSqlSyncDatabaseInput.java |  228 ++++
 ...eOracleAzureDbPostgreSqlSyncTaskInput.java |   97 ++
 ...OracleAzureDbPostgreSqlSyncTaskOutput.java |   45 +
 ...PostgreSqlSyncTaskOutputDatabaseError.java |   74 ++
 ...PostgreSqlSyncTaskOutputDatabaseLevel.java |  250 ++++
 ...eAzureDbPostgreSqlSyncTaskOutputError.java |   36 +
 ...ostgreSqlSyncTaskOutputMigrationLevel.java |  112 ++
 ...eDbPostgreSqlSyncTaskOutputTableLevel.java |  218 ++++
 ...AzureDbForPostgreSqlSyncDatabaseInput.java |   79 ++
 ...SqlAzureDbForPostgreSqlSyncTaskOutput.java |    2 +-
 ...PostgreSqlSyncTaskOutputDatabaseError.java |    2 +-
 ...PostgreSqlSyncTaskOutputDatabaseLevel.java |    2 +-
 ...ureDbForPostgreSqlSyncTaskOutputError.java |    2 +-
 ...ostgreSqlSyncTaskOutputMigrationLevel.java |    2 +-
 ...ForPostgreSqlSyncTaskOutputTableLevel.java |    2 +-
 ...zureDbForPostgreSqlSyncTaskProperties.java |    2 +-
 ...MigrateSchemaSqlServerSqlDbTaskOutput.java |    2 +-
 ...SqlServerSqlDbTaskOutputDatabaseLevel.java |    2 +-
 ...teSchemaSqlServerSqlDbTaskOutputError.java |    2 +-
 ...qlServerSqlDbTaskOutputMigrationLevel.java |    2 +-
 ...ateSchemaSqlServerSqlDbTaskProperties.java |    2 +-
 .../MigrateSchemaSqlTaskOutputError.java      |    2 +-
 .../MigrateSqlServerSqlDbSyncTaskOutput.java  |    2 +-
 ...erverSqlDbSyncTaskOutputDatabaseError.java |    2 +-
 ...erverSqlDbSyncTaskOutputDatabaseLevel.java |    2 +-
 ...rateSqlServerSqlDbSyncTaskOutputError.java |    2 +-
 ...rverSqlDbSyncTaskOutputMigrationLevel.java |    2 +-
 ...qlServerSqlDbSyncTaskOutputTableLevel.java |    2 +-
 ...grateSqlServerSqlDbSyncTaskProperties.java |    2 +-
 .../MigrateSqlServerSqlDbTaskOutput.java      |    2 +-
 ...SqlServerSqlDbTaskOutputDatabaseLevel.java |    2 +-
 .../MigrateSqlServerSqlDbTaskOutputError.java |    2 +-
 ...qlServerSqlDbTaskOutputMigrationLevel.java |    2 +-
 ...ateSqlServerSqlDbTaskOutputTableLevel.java |    2 +-
 .../MigrateSqlServerSqlDbTaskProperties.java  |    2 +-
 .../MigrateSqlServerSqlMISyncTaskInput.java   |   17 +
 .../MigrateSqlServerSqlMISyncTaskOutput.java  |   43 +
 ...erverSqlMISyncTaskOutputDatabaseLevel.java |  193 +++
 ...rateSqlServerSqlMISyncTaskOutputError.java |   36 +
 ...rverSqlMISyncTaskOutputMigrationLevel.java |  188 +++
 ...grateSqlServerSqlMISyncTaskProperties.java |   64 +
 .../MigrateSqlServerSqlMITaskOutput.java      |    2 +-
 ...SqlServerSqlMITaskOutputAgentJobLevel.java |    2 +-
 ...SqlServerSqlMITaskOutputDatabaseLevel.java |    2 +-
 .../MigrateSqlServerSqlMITaskOutputError.java |    2 +-
 ...ateSqlServerSqlMITaskOutputLoginLevel.java |    2 +-
 ...qlServerSqlMITaskOutputMigrationLevel.java |   16 +-
 .../MigrateSqlServerSqlMITaskProperties.java  |    2 +-
 .../MigrateSsisTaskInput.java                 |   44 +
 .../MigrateSsisTaskOutput.java                |   42 +
 .../MigrateSsisTaskOutputMigrationLevel.java  |  176 +++
 .../MigrateSsisTaskOutputProjectLevel.java    |  145 +++
 .../MigrateSsisTaskProperties.java            |   64 +
 .../MigrateSyncCompleteCommandOutput.java     |   26 +-
 .../MigrateSyncCompleteCommandProperties.java |    2 +-
 .../MongoDbCancelCommand.java                 |    2 +-
 .../MongoDbConnectionInfo.java                |    2 +-
 .../MongoDbFinishCommand.java                 |    2 +-
 .../MongoDbRestartCommand.java                |    2 +-
 .../MySqlConnectionInfo.java                  |    2 +-
 .../MySqlTargetPlatformType.java              |    3 +
 .../OracleConnectionInfo.java                 |   47 +
 .../OracleOCIDriverInfo.java                  |  109 ++
 .../v2018_07_15_preview/OrphanedUserInfo.java |   69 +
 .../PostgreSqlConnectionInfo.java             |    2 +-
 ...sk.java => ProjectServiceProjectTask.java} |   28 +-
 .../ProjectTaskProperties.java                |   22 +-
 .../ServerLevelPermissionsGroup.java          |   54 +-
 .../v2018_07_15_preview/ServerProperties.java |    2 +-
 .../ServiceProjectTask.java                   |  146 +++
 .../v2018_07_15_preview/ServiceTasks.java     |   68 +
 .../SqlConnectionInfo.java                    |    2 +-
 .../SqlServerSqlMISyncTaskInput.java          |  177 +++
 .../SsisMigrationInfo.java                    |   98 ++
 .../SsisMigrationOverwriteOption.java         |   41 +
 .../SsisMigrationStage.java                   |   47 +
 .../v2018_07_15_preview/SsisStoreType.java    |   38 +
 .../v2018_07_15_preview/Tasks.java            |    8 +-
 .../UploadOCIDriverTaskInput.java             |   43 +
 .../UploadOCIDriverTaskOutput.java            |   48 +
 .../UploadOCIDriverTaskProperties.java        |   63 +
 ...InputSqlServerSqlDbSyncTaskProperties.java |    2 +-
 ...ationInputSqlServerSqlMISyncTaskInput.java |   17 +
 ...tionInputSqlServerSqlMISyncTaskOutput.java |   64 +
 ...InputSqlServerSqlMISyncTaskProperties.java |   64 +
 ...tionInputSqlServerSqlMITaskProperties.java |    2 +-
 .../ValidateMongoDbTaskProperties.java        |    2 +-
 ...zureDbForPostgreSqlSyncTaskProperties.java |   64 +
 ...OracleAzureDbPostgreSqlSyncTaskOutput.java |   34 +
 .../CommandPropertiesInner.java               |   54 +-
 .../implementation/DataMigrationManager.java  |   12 +
 .../DataMigrationServiceClientImpl.java       |   14 +
 .../implementation/FilesImpl.java             |   10 +-
 ...ava => ProjectServiceProjectTaskImpl.java} |   18 +-
 .../implementation/ProjectsImpl.java          |   10 +-
 .../ServiceProjectTaskImpl.java               |  117 ++
 .../implementation/ServiceTasksImpl.java      |   98 ++
 .../implementation/ServiceTasksInner.java     | 1158 +++++++++++++++++
 .../implementation/TasksImpl.java             |   38 +-
 168 files changed, 7906 insertions(+), 200 deletions(-)
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/AzureActiveDirectoryApp.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileInfo.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileStatus.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupSetInfo.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/DatabaseMigrationState.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MiSqlConnectionInfo.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncDatabaseInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputError.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputError.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputMigrationLevel.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputMigrationLevel.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputProjectLevel.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleConnectionInfo.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleOCIDriverInfo.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OrphanedUserInfo.java
 rename datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/{ProjectTask.java => ProjectServiceProjectTask.java} (72%)
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceProjectTask.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceTasks.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlServerSqlMISyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationInfo.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationOverwriteOption.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationStage.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisStoreType.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskInput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskOutput.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbPostgreSqlSyncTaskOutput.java
 rename datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/{ProjectTaskImpl.java => ProjectServiceProjectTaskImpl.java} (78%)
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceProjectTaskImpl.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksImpl.java
 create mode 100644 datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksInner.java

diff --git a/datamigration/resource-manager/v2018_07_15_preview/pom.xml b/datamigration/resource-manager/v2018_07_15_preview/pom.xml
index f8e10a9824e5..8b29ac9b9adb 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/pom.xml
+++ b/datamigration/resource-manager/v2018_07_15_preview/pom.xml
@@ -15,7 +15,7 @@
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-datamigration</artifactId>
-    <version>1.0.0-beta</version>
+    <version>1.0.0-beta-1</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for DataMigration Management</name>
     <description>This package contains Microsoft DataMigration Management SDK.</description>
@@ -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/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/AzureActiveDirectoryApp.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/AzureActiveDirectoryApp.java
new file mode 100644
index 000000000000..527828e1d61e
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/AzureActiveDirectoryApp.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Azure Active Directory Application.
+ */
+public class AzureActiveDirectoryApp {
+    /**
+     * Application ID of the Azure Active Directory Application.
+     */
+    @JsonProperty(value = "applicationId", required = true)
+    private String applicationId;
+
+    /**
+     * Key used to authenticate to the Azure Active Directory Application.
+     */
+    @JsonProperty(value = "appKey", required = true)
+    private String appKey;
+
+    /**
+     * Tenant id of the customer.
+     */
+    @JsonProperty(value = "tenantId", required = true)
+    private String tenantId;
+
+    /**
+     * Get application ID of the Azure Active Directory Application.
+     *
+     * @return the applicationId value
+     */
+    public String applicationId() {
+        return this.applicationId;
+    }
+
+    /**
+     * Set application ID of the Azure Active Directory Application.
+     *
+     * @param applicationId the applicationId value to set
+     * @return the AzureActiveDirectoryApp object itself.
+     */
+    public AzureActiveDirectoryApp withApplicationId(String applicationId) {
+        this.applicationId = applicationId;
+        return this;
+    }
+
+    /**
+     * Get key used to authenticate to the Azure Active Directory Application.
+     *
+     * @return the appKey value
+     */
+    public String appKey() {
+        return this.appKey;
+    }
+
+    /**
+     * Set key used to authenticate to the Azure Active Directory Application.
+     *
+     * @param appKey the appKey value to set
+     * @return the AzureActiveDirectoryApp object itself.
+     */
+    public AzureActiveDirectoryApp withAppKey(String appKey) {
+        this.appKey = appKey;
+        return this;
+    }
+
+    /**
+     * Get tenant id of the customer.
+     *
+     * @return the tenantId value
+     */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Set tenant id of the customer.
+     *
+     * @param tenantId the tenantId value to set
+     * @return the AzureActiveDirectoryApp object itself.
+     */
+    public AzureActiveDirectoryApp withTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileInfo.java
new file mode 100644
index 000000000000..63d46f93bcbb
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileInfo.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information of the backup file.
+ */
+public class BackupFileInfo {
+    /**
+     * Location of the backup file in shared folder.
+     */
+    @JsonProperty(value = "fileLocation")
+    private String fileLocation;
+
+    /**
+     * Sequence number of the backup file in the backup set.
+     */
+    @JsonProperty(value = "familySequenceNumber")
+    private Integer familySequenceNumber;
+
+    /**
+     * Status of the backup file during migration. Possible values include:
+     * 'Arrived', 'Queued', 'Uploading', 'Uploaded', 'Restoring', 'Restored',
+     * 'Cancelled'.
+     */
+    @JsonProperty(value = "status")
+    private BackupFileStatus status;
+
+    /**
+     * Get location of the backup file in shared folder.
+     *
+     * @return the fileLocation value
+     */
+    public String fileLocation() {
+        return this.fileLocation;
+    }
+
+    /**
+     * Set location of the backup file in shared folder.
+     *
+     * @param fileLocation the fileLocation value to set
+     * @return the BackupFileInfo object itself.
+     */
+    public BackupFileInfo withFileLocation(String fileLocation) {
+        this.fileLocation = fileLocation;
+        return this;
+    }
+
+    /**
+     * Get sequence number of the backup file in the backup set.
+     *
+     * @return the familySequenceNumber value
+     */
+    public Integer familySequenceNumber() {
+        return this.familySequenceNumber;
+    }
+
+    /**
+     * Set sequence number of the backup file in the backup set.
+     *
+     * @param familySequenceNumber the familySequenceNumber value to set
+     * @return the BackupFileInfo object itself.
+     */
+    public BackupFileInfo withFamilySequenceNumber(Integer familySequenceNumber) {
+        this.familySequenceNumber = familySequenceNumber;
+        return this;
+    }
+
+    /**
+     * Get status of the backup file during migration. Possible values include: 'Arrived', 'Queued', 'Uploading', 'Uploaded', 'Restoring', 'Restored', 'Cancelled'.
+     *
+     * @return the status value
+     */
+    public BackupFileStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Set status of the backup file during migration. Possible values include: 'Arrived', 'Queued', 'Uploading', 'Uploaded', 'Restoring', 'Restored', 'Cancelled'.
+     *
+     * @param status the status value to set
+     * @return the BackupFileInfo object itself.
+     */
+    public BackupFileInfo withStatus(BackupFileStatus status) {
+        this.status = status;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileStatus.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileStatus.java
new file mode 100644
index 000000000000..cd52ce0efd5e
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupFileStatus.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.datamigration.v2018_07_15_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for BackupFileStatus.
+ */
+public final class BackupFileStatus extends ExpandableStringEnum<BackupFileStatus> {
+    /** Static value Arrived for BackupFileStatus. */
+    public static final BackupFileStatus ARRIVED = fromString("Arrived");
+
+    /** Static value Queued for BackupFileStatus. */
+    public static final BackupFileStatus QUEUED = fromString("Queued");
+
+    /** Static value Uploading for BackupFileStatus. */
+    public static final BackupFileStatus UPLOADING = fromString("Uploading");
+
+    /** Static value Uploaded for BackupFileStatus. */
+    public static final BackupFileStatus UPLOADED = fromString("Uploaded");
+
+    /** Static value Restoring for BackupFileStatus. */
+    public static final BackupFileStatus RESTORING = fromString("Restoring");
+
+    /** Static value Restored for BackupFileStatus. */
+    public static final BackupFileStatus RESTORED = fromString("Restored");
+
+    /** Static value Cancelled for BackupFileStatus. */
+    public static final BackupFileStatus CANCELLED = fromString("Cancelled");
+
+    /**
+     * Creates or finds a BackupFileStatus from its string representation.
+     * @param name a name to look for
+     * @return the corresponding BackupFileStatus
+     */
+    @JsonCreator
+    public static BackupFileStatus fromString(String name) {
+        return fromString(name, BackupFileStatus.class);
+    }
+
+    /**
+     * @return known BackupFileStatus values
+     */
+    public static Collection<BackupFileStatus> values() {
+        return values(BackupFileStatus.class);
+    }
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupSetInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupSetInfo.java
new file mode 100644
index 000000000000..58fe02be7d2c
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/BackupSetInfo.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.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information of backup set.
+ */
+public class BackupSetInfo {
+    /**
+     * Id for the set of backup files.
+     */
+    @JsonProperty(value = "backupSetId")
+    private String backupSetId;
+
+    /**
+     * First log sequence number of the backup file.
+     */
+    @JsonProperty(value = "firstLsn")
+    private String firstLsn;
+
+    /**
+     * Last log sequence number of the backup file.
+     */
+    @JsonProperty(value = "lastLsn")
+    private String lastLsn;
+
+    /**
+     * Last modified time of the backup file in share location.
+     */
+    @JsonProperty(value = "lastModifiedTime")
+    private DateTime lastModifiedTime;
+
+    /**
+     * Enum of the different backup types. Possible values include: 'Database',
+     * 'TransactionLog', 'File', 'DifferentialDatabase', 'DifferentialFile',
+     * 'Partial', 'DifferentialPartial'.
+     */
+    @JsonProperty(value = "backupType")
+    private BackupType backupType;
+
+    /**
+     * List of files in the backup set.
+     */
+    @JsonProperty(value = "listOfBackupFiles")
+    private List<BackupFileInfo> listOfBackupFiles;
+
+    /**
+     * Name of the database to which the backup set belongs.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * Date and time that the backup operation began.
+     */
+    @JsonProperty(value = "backupStartDate")
+    private DateTime backupStartDate;
+
+    /**
+     * Date and time that the backup operation finished.
+     */
+    @JsonProperty(value = "backupFinishedDate")
+    private DateTime backupFinishedDate;
+
+    /**
+     * Whether the backup set is restored or not.
+     */
+    @JsonProperty(value = "isBackupRestored")
+    private Boolean isBackupRestored;
+
+    /**
+     * Get id for the set of backup files.
+     *
+     * @return the backupSetId value
+     */
+    public String backupSetId() {
+        return this.backupSetId;
+    }
+
+    /**
+     * Set id for the set of backup files.
+     *
+     * @param backupSetId the backupSetId value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withBackupSetId(String backupSetId) {
+        this.backupSetId = backupSetId;
+        return this;
+    }
+
+    /**
+     * Get first log sequence number of the backup file.
+     *
+     * @return the firstLsn value
+     */
+    public String firstLsn() {
+        return this.firstLsn;
+    }
+
+    /**
+     * Set first log sequence number of the backup file.
+     *
+     * @param firstLsn the firstLsn value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withFirstLsn(String firstLsn) {
+        this.firstLsn = firstLsn;
+        return this;
+    }
+
+    /**
+     * Get last log sequence number of the backup file.
+     *
+     * @return the lastLsn value
+     */
+    public String lastLsn() {
+        return this.lastLsn;
+    }
+
+    /**
+     * Set last log sequence number of the backup file.
+     *
+     * @param lastLsn the lastLsn value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withLastLsn(String lastLsn) {
+        this.lastLsn = lastLsn;
+        return this;
+    }
+
+    /**
+     * Get last modified time of the backup file in share location.
+     *
+     * @return the lastModifiedTime value
+     */
+    public DateTime lastModifiedTime() {
+        return this.lastModifiedTime;
+    }
+
+    /**
+     * Set last modified time of the backup file in share location.
+     *
+     * @param lastModifiedTime the lastModifiedTime value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withLastModifiedTime(DateTime lastModifiedTime) {
+        this.lastModifiedTime = lastModifiedTime;
+        return this;
+    }
+
+    /**
+     * Get enum of the different backup types. Possible values include: 'Database', 'TransactionLog', 'File', 'DifferentialDatabase', 'DifferentialFile', 'Partial', 'DifferentialPartial'.
+     *
+     * @return the backupType value
+     */
+    public BackupType backupType() {
+        return this.backupType;
+    }
+
+    /**
+     * Set enum of the different backup types. Possible values include: 'Database', 'TransactionLog', 'File', 'DifferentialDatabase', 'DifferentialFile', 'Partial', 'DifferentialPartial'.
+     *
+     * @param backupType the backupType value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withBackupType(BackupType backupType) {
+        this.backupType = backupType;
+        return this;
+    }
+
+    /**
+     * Get list of files in the backup set.
+     *
+     * @return the listOfBackupFiles value
+     */
+    public List<BackupFileInfo> listOfBackupFiles() {
+        return this.listOfBackupFiles;
+    }
+
+    /**
+     * Set list of files in the backup set.
+     *
+     * @param listOfBackupFiles the listOfBackupFiles value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withListOfBackupFiles(List<BackupFileInfo> listOfBackupFiles) {
+        this.listOfBackupFiles = listOfBackupFiles;
+        return this;
+    }
+
+    /**
+     * Get name of the database to which the backup set belongs.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set name of the database to which the backup set belongs.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get date and time that the backup operation began.
+     *
+     * @return the backupStartDate value
+     */
+    public DateTime backupStartDate() {
+        return this.backupStartDate;
+    }
+
+    /**
+     * Set date and time that the backup operation began.
+     *
+     * @param backupStartDate the backupStartDate value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withBackupStartDate(DateTime backupStartDate) {
+        this.backupStartDate = backupStartDate;
+        return this;
+    }
+
+    /**
+     * Get date and time that the backup operation finished.
+     *
+     * @return the backupFinishedDate value
+     */
+    public DateTime backupFinishedDate() {
+        return this.backupFinishedDate;
+    }
+
+    /**
+     * Set date and time that the backup operation finished.
+     *
+     * @param backupFinishedDate the backupFinishedDate value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withBackupFinishedDate(DateTime backupFinishedDate) {
+        this.backupFinishedDate = backupFinishedDate;
+        return this;
+    }
+
+    /**
+     * Get whether the backup set is restored or not.
+     *
+     * @return the isBackupRestored value
+     */
+    public Boolean isBackupRestored() {
+        return this.isBackupRestored;
+    }
+
+    /**
+     * Set whether the backup set is restored or not.
+     *
+     * @param isBackupRestored the isBackupRestored value to set
+     * @return the BackupSetInfo object itself.
+     */
+    public BackupSetInfo withIsBackupRestored(Boolean isBackupRestored) {
+        this.isBackupRestored = isBackupRestored;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskInput.java
new file mode 100644
index 000000000000..d74b6fcb610f
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the service task to check for OCI drivers.
+ */
+public class CheckOCIDriverTaskInput {
+    /**
+     * Version of the source server to check against.  Optional.
+     */
+    @JsonProperty(value = "serverVersion")
+    private String serverVersion;
+
+    /**
+     * Get version of the source server to check against.  Optional.
+     *
+     * @return the serverVersion value
+     */
+    public String serverVersion() {
+        return this.serverVersion;
+    }
+
+    /**
+     * Set version of the source server to check against.  Optional.
+     *
+     * @param serverVersion the serverVersion value to set
+     * @return the CheckOCIDriverTaskInput object itself.
+     */
+    public CheckOCIDriverTaskInput withServerVersion(String serverVersion) {
+        this.serverVersion = serverVersion;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskOutput.java
new file mode 100644
index 000000000000..79581c783cda
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.Map;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the service task to check for OCI drivers.
+ */
+public class CheckOCIDriverTaskOutput {
+    /**
+     * Information about the installed driver if found and valid.
+     */
+    @JsonProperty(value = "installedDriver", access = JsonProperty.Access.WRITE_ONLY)
+    private Map<String, List<OracleOCIDriverInfo>> installedDriver;
+
+    /**
+     * Validation errors.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get information about the installed driver if found and valid.
+     *
+     * @return the installedDriver value
+     */
+    public Map<String, List<OracleOCIDriverInfo>> installedDriver() {
+        return this.installedDriver;
+    }
+
+    /**
+     * Get validation errors.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskProperties.java
new file mode 100644
index 000000000000..8eb79918ac8c
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/CheckOCIDriverTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that checks for OCI drivers.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = CheckOCIDriverTaskProperties.class)
+@JsonTypeName("Service.Check.OCI")
+public class CheckOCIDriverTaskProperties extends ProjectTaskProperties {
+    /**
+     * The input property.
+     */
+    @JsonProperty(value = "input")
+    private CheckOCIDriverTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<CheckOCIDriverTaskOutput> output;
+
+    /**
+     * Get the input value.
+     *
+     * @return the input value
+     */
+    public CheckOCIDriverTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set the input value.
+     *
+     * @param input the input value to set
+     * @return the CheckOCIDriverTaskProperties object itself.
+     */
+    public CheckOCIDriverTaskProperties withInput(CheckOCIDriverTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<CheckOCIDriverTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToMongoDbTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToMongoDbTaskProperties.java
index 0d5f978e4b7c..9477624b0c36 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToMongoDbTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToMongoDbTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates the connection to and provides
  * information about a MongoDB server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToMongoDbTaskProperties.class)
 @JsonTypeName("Connect.MongoDb")
 public class ConnectToMongoDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskInput.java
index 3f2239d3fcd5..11c543452b33 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskInput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskInput.java
@@ -21,7 +21,7 @@ public class ConnectToSourceMySqlTaskInput {
     private MySqlConnectionInfo sourceConnectionInfo;
 
     /**
-     * Target Platform for the migration. Possible values include:
+     * Target Platform for the migration. Possible values include: 'SqlServer',
      * 'AzureDbForMySQL'.
      */
     @JsonProperty(value = "targetPlatform")
@@ -56,7 +56,7 @@ public ConnectToSourceMySqlTaskInput withSourceConnectionInfo(MySqlConnectionInf
     }
 
     /**
-     * Get target Platform for the migration. Possible values include: 'AzureDbForMySQL'.
+     * Get target Platform for the migration. Possible values include: 'SqlServer', 'AzureDbForMySQL'.
      *
      * @return the targetPlatform value
      */
@@ -65,7 +65,7 @@ public MySqlTargetPlatformType targetPlatform() {
     }
 
     /**
-     * Set target Platform for the migration. Possible values include: 'AzureDbForMySQL'.
+     * Set target Platform for the migration. Possible values include: 'SqlServer', 'AzureDbForMySQL'.
      *
      * @param targetPlatform the targetPlatform value to set
      * @return the ConnectToSourceMySqlTaskInput object itself.
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskProperties.java
index f8719ccfacc5..1c0bb1755b48 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceMySqlTaskProperties.java
@@ -16,7 +16,7 @@
 /**
  * Properties for the task that validates MySQL database connection.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToSourceMySqlTaskProperties.class)
 @JsonTypeName("ConnectToSource.MySql")
 public class ConnectToSourceMySqlTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceNonSqlTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceNonSqlTaskOutput.java
index 37e89141a1c7..c86a04fd9289 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceNonSqlTaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceNonSqlTaskOutput.java
@@ -12,7 +12,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Output for connect to Oracle, MySQL type source.
+ * Output for connect to MySQL type source.
  */
 public class ConnectToSourceNonSqlTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskInput.java
new file mode 100644
index 000000000000..e9bcecfc2343
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that validates Oracle database connection.
+ */
+public class ConnectToSourceOracleSyncTaskInput {
+    /**
+     * Information for connecting to Oracle source.
+     */
+    @JsonProperty(value = "sourceConnectionInfo", required = true)
+    private OracleConnectionInfo sourceConnectionInfo;
+
+    /**
+     * Get information for connecting to Oracle source.
+     *
+     * @return the sourceConnectionInfo value
+     */
+    public OracleConnectionInfo sourceConnectionInfo() {
+        return this.sourceConnectionInfo;
+    }
+
+    /**
+     * Set information for connecting to Oracle source.
+     *
+     * @param sourceConnectionInfo the sourceConnectionInfo value to set
+     * @return the ConnectToSourceOracleSyncTaskInput object itself.
+     */
+    public ConnectToSourceOracleSyncTaskInput withSourceConnectionInfo(OracleConnectionInfo sourceConnectionInfo) {
+        this.sourceConnectionInfo = sourceConnectionInfo;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskOutput.java
new file mode 100644
index 000000000000..a3e777fd70fb
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the task that validates Oracle database connection.
+ */
+public class ConnectToSourceOracleSyncTaskOutput {
+    /**
+     * Version of the source server.
+     */
+    @JsonProperty(value = "sourceServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerVersion;
+
+    /**
+     * List of schemas on source server.
+     */
+    @JsonProperty(value = "databases", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> databases;
+
+    /**
+     * Source server brand version.
+     */
+    @JsonProperty(value = "sourceServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerBrandVersion;
+
+    /**
+     * Validation errors associated with the task.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get version of the source server.
+     *
+     * @return the sourceServerVersion value
+     */
+    public String sourceServerVersion() {
+        return this.sourceServerVersion;
+    }
+
+    /**
+     * Get list of schemas on source server.
+     *
+     * @return the databases value
+     */
+    public List<String> databases() {
+        return this.databases;
+    }
+
+    /**
+     * Get source server brand version.
+     *
+     * @return the sourceServerBrandVersion value
+     */
+    public String sourceServerBrandVersion() {
+        return this.sourceServerBrandVersion;
+    }
+
+    /**
+     * Get validation errors associated with the task.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskProperties.java
new file mode 100644
index 000000000000..a76f8051037f
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceOracleSyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that validates Oracle database connection.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToSourceOracleSyncTaskProperties.class)
+@JsonTypeName("ConnectToSource.Oracle.Sync")
+public class ConnectToSourceOracleSyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private ConnectToSourceOracleSyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectToSourceOracleSyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public ConnectToSourceOracleSyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the ConnectToSourceOracleSyncTaskProperties object itself.
+     */
+    public ConnectToSourceOracleSyncTaskProperties withInput(ConnectToSourceOracleSyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<ConnectToSourceOracleSyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskInput.java
new file mode 100644
index 000000000000..ed637ac50eec
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that validates connection to PostgreSQL and source server
+ * requirements.
+ */
+public class ConnectToSourcePostgreSqlSyncTaskInput {
+    /**
+     * Connection information for source PostgreSQL server.
+     */
+    @JsonProperty(value = "sourceConnectionInfo", required = true)
+    private PostgreSqlConnectionInfo sourceConnectionInfo;
+
+    /**
+     * Get connection information for source PostgreSQL server.
+     *
+     * @return the sourceConnectionInfo value
+     */
+    public PostgreSqlConnectionInfo sourceConnectionInfo() {
+        return this.sourceConnectionInfo;
+    }
+
+    /**
+     * Set connection information for source PostgreSQL server.
+     *
+     * @param sourceConnectionInfo the sourceConnectionInfo value to set
+     * @return the ConnectToSourcePostgreSqlSyncTaskInput object itself.
+     */
+    public ConnectToSourcePostgreSqlSyncTaskInput withSourceConnectionInfo(PostgreSqlConnectionInfo sourceConnectionInfo) {
+        this.sourceConnectionInfo = sourceConnectionInfo;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskOutput.java
new file mode 100644
index 000000000000..b1aad780a575
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the task that validates connection to PostgreSQL and source
+ * server requirements.
+ */
+public class ConnectToSourcePostgreSqlSyncTaskOutput {
+    /**
+     * Result identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Version of the source server.
+     */
+    @JsonProperty(value = "sourceServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerVersion;
+
+    /**
+     * List of databases on source server.
+     */
+    @JsonProperty(value = "databases", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> databases;
+
+    /**
+     * Source server brand version.
+     */
+    @JsonProperty(value = "sourceServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerBrandVersion;
+
+    /**
+     * Validation errors associated with the task.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get result identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get version of the source server.
+     *
+     * @return the sourceServerVersion value
+     */
+    public String sourceServerVersion() {
+        return this.sourceServerVersion;
+    }
+
+    /**
+     * Get list of databases on source server.
+     *
+     * @return the databases value
+     */
+    public List<String> databases() {
+        return this.databases;
+    }
+
+    /**
+     * Get source server brand version.
+     *
+     * @return the sourceServerBrandVersion value
+     */
+    public String sourceServerBrandVersion() {
+        return this.sourceServerBrandVersion;
+    }
+
+    /**
+     * Get validation errors associated with the task.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskProperties.java
new file mode 100644
index 000000000000..7baf6ccc0153
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourcePostgreSqlSyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that validates connection to PostgreSQL server and
+ * source server requirements for online migration.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToSourcePostgreSqlSyncTaskProperties.class)
+@JsonTypeName("ConnectToSource.PostgreSql.Sync")
+public class ConnectToSourcePostgreSqlSyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private ConnectToSourcePostgreSqlSyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectToSourcePostgreSqlSyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public ConnectToSourcePostgreSqlSyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the ConnectToSourcePostgreSqlSyncTaskProperties object itself.
+     */
+    public ConnectToSourcePostgreSqlSyncTaskProperties withInput(ConnectToSourcePostgreSqlSyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<ConnectToSourcePostgreSqlSyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerSyncTaskProperties.java
index f3a6974a86ad..1dee0528673e 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerSyncTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerSyncTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to SQL Server and source
  * server requirements for online migration.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToSourceSqlServerSyncTaskProperties.class)
 @JsonTypeName("ConnectToSource.SqlServer.Sync")
 public class ConnectToSourceSqlServerSyncTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskInput.java
index c20b8dbc670a..94c6d9855136 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskInput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskInput.java
@@ -29,6 +29,12 @@ public class ConnectToSourceSqlServerTaskInput {
     @JsonProperty(value = "checkPermissionsGroup")
     private ServerLevelPermissionsGroup checkPermissionsGroup;
 
+    /**
+     * Flag for whether to collect databases from source server.
+     */
+    @JsonProperty(value = "collectDatabases")
+    private Boolean collectDatabases;
+
     /**
      * Flag for whether to collect logins from source server.
      */
@@ -47,6 +53,13 @@ public class ConnectToSourceSqlServerTaskInput {
     @JsonProperty(value = "collectTdeCertificateInfo")
     private Boolean collectTdeCertificateInfo;
 
+    /**
+     * Flag for whether to validate SSIS catalog is reachable on the source
+     * server.
+     */
+    @JsonProperty(value = "validateSsisCatalogOnly")
+    private Boolean validateSsisCatalogOnly;
+
     /**
      * Get connection information for Source SQL Server.
      *
@@ -87,6 +100,26 @@ public ConnectToSourceSqlServerTaskInput withCheckPermissionsGroup(ServerLevelPe
         return this;
     }
 
+    /**
+     * Get flag for whether to collect databases from source server.
+     *
+     * @return the collectDatabases value
+     */
+    public Boolean collectDatabases() {
+        return this.collectDatabases;
+    }
+
+    /**
+     * Set flag for whether to collect databases from source server.
+     *
+     * @param collectDatabases the collectDatabases value to set
+     * @return the ConnectToSourceSqlServerTaskInput object itself.
+     */
+    public ConnectToSourceSqlServerTaskInput withCollectDatabases(Boolean collectDatabases) {
+        this.collectDatabases = collectDatabases;
+        return this;
+    }
+
     /**
      * Get flag for whether to collect logins from source server.
      *
@@ -147,4 +180,24 @@ public ConnectToSourceSqlServerTaskInput withCollectTdeCertificateInfo(Boolean c
         return this;
     }
 
+    /**
+     * Get flag for whether to validate SSIS catalog is reachable on the source server.
+     *
+     * @return the validateSsisCatalogOnly value
+     */
+    public Boolean validateSsisCatalogOnly() {
+        return this.validateSsisCatalogOnly;
+    }
+
+    /**
+     * Set flag for whether to validate SSIS catalog is reachable on the source server.
+     *
+     * @param validateSsisCatalogOnly the validateSsisCatalogOnly value to set
+     * @return the ConnectToSourceSqlServerTaskInput object itself.
+     */
+    public ConnectToSourceSqlServerTaskInput withValidateSsisCatalogOnly(Boolean validateSsisCatalogOnly) {
+        this.validateSsisCatalogOnly = validateSsisCatalogOnly;
+        return this;
+    }
+
 }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutput.java
index c21fd4845606..b1dea666688a 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that validates connection to SQL Server and also
  * validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutput.class)
 @JsonTypeName("ConnectToSourceSqlServerTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "AgentJobLevelOutput", value = ConnectToSourceSqlServerTaskOutputAgentJobLevel.class),
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java
index 6fad4be12de2..ce3fa6d859a4 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java
@@ -18,7 +18,7 @@
  * Agent Job level output for the task that validates connection to SQL Server
  * and also validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputAgentJobLevel.class)
 @JsonTypeName("AgentJobLevelOutput")
 public class ConnectToSourceSqlServerTaskOutputAgentJobLevel extends ConnectToSourceSqlServerTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java
index 25f294d2a841..0fb4f60f4dc7 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java
@@ -17,7 +17,7 @@
  * Database level output for the task that validates connection to SQL Server
  * and also validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class ConnectToSourceSqlServerTaskOutputDatabaseLevel extends ConnectToSourceSqlServerTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java
index f4cbbae769c5..83e4ca0b704c 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java
@@ -16,7 +16,7 @@
  * Login level output for the task that validates connection to SQL Server and
  * also validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputLoginLevel.class)
 @JsonTypeName("LoginLevelOutput")
 public class ConnectToSourceSqlServerTaskOutputLoginLevel extends ConnectToSourceSqlServerTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java
index e1b1870bda07..403532deab09 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java
@@ -18,7 +18,7 @@
  * Task level output for the task that validates connection to SQL Server and
  * also validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputTaskLevel.class)
 @JsonTypeName("TaskLevelOutput")
 public class ConnectToSourceSqlServerTaskOutputTaskLevel extends ConnectToSourceSqlServerTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskProperties.java
index 50c0c18713d0..1cd0abb274cb 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToSourceSqlServerTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to SQL Server and also
  * validates source server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToSourceSqlServerTaskProperties.class)
 @JsonTypeName("ConnectToSource.SqlServer")
 public class ConnectToSourceSqlServerTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForMySqlTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForMySqlTaskProperties.java
index 0ba4955a2809..79fa93730ad5 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForMySqlTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForMySqlTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to Azure Database for
  * MySQL and target server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetAzureDbForMySqlTaskProperties.class)
 @JsonTypeName("ConnectToTarget.AzureDbForMySql")
 public class ConnectToTargetAzureDbForMySqlTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskInput.java
new file mode 100644
index 000000000000..bff9b0d99930
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that validates connection to Azure Database for
+ * PostgreSQL and target server requirements.
+ */
+public class ConnectToTargetAzureDbForPostgreSqlSyncTaskInput {
+    /**
+     * Connection information for source PostgreSQL server.
+     */
+    @JsonProperty(value = "sourceConnectionInfo", required = true)
+    private PostgreSqlConnectionInfo sourceConnectionInfo;
+
+    /**
+     * Connection information for target Azure Database for PostgreSQL server.
+     */
+    @JsonProperty(value = "targetConnectionInfo", required = true)
+    private PostgreSqlConnectionInfo targetConnectionInfo;
+
+    /**
+     * Get connection information for source PostgreSQL server.
+     *
+     * @return the sourceConnectionInfo value
+     */
+    public PostgreSqlConnectionInfo sourceConnectionInfo() {
+        return this.sourceConnectionInfo;
+    }
+
+    /**
+     * Set connection information for source PostgreSQL server.
+     *
+     * @param sourceConnectionInfo the sourceConnectionInfo value to set
+     * @return the ConnectToTargetAzureDbForPostgreSqlSyncTaskInput object itself.
+     */
+    public ConnectToTargetAzureDbForPostgreSqlSyncTaskInput withSourceConnectionInfo(PostgreSqlConnectionInfo sourceConnectionInfo) {
+        this.sourceConnectionInfo = sourceConnectionInfo;
+        return this;
+    }
+
+    /**
+     * Get connection information for target Azure Database for PostgreSQL server.
+     *
+     * @return the targetConnectionInfo value
+     */
+    public PostgreSqlConnectionInfo targetConnectionInfo() {
+        return this.targetConnectionInfo;
+    }
+
+    /**
+     * Set connection information for target Azure Database for PostgreSQL server.
+     *
+     * @param targetConnectionInfo the targetConnectionInfo value to set
+     * @return the ConnectToTargetAzureDbForPostgreSqlSyncTaskInput object itself.
+     */
+    public ConnectToTargetAzureDbForPostgreSqlSyncTaskInput withTargetConnectionInfo(PostgreSqlConnectionInfo targetConnectionInfo) {
+        this.targetConnectionInfo = targetConnectionInfo;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskOutput.java
new file mode 100644
index 000000000000..9cb10b4ba160
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the task that validates connection to Azure Database for
+ * PostgreSQL and target server requirements.
+ */
+public class ConnectToTargetAzureDbForPostgreSqlSyncTaskOutput {
+    /**
+     * Result identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Version of the target server.
+     */
+    @JsonProperty(value = "targetServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerVersion;
+
+    /**
+     * List of databases on target server.
+     */
+    @JsonProperty(value = "databases", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> databases;
+
+    /**
+     * Target server brand version.
+     */
+    @JsonProperty(value = "targetServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerBrandVersion;
+
+    /**
+     * Validation errors associated with the task.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get result identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get version of the target server.
+     *
+     * @return the targetServerVersion value
+     */
+    public String targetServerVersion() {
+        return this.targetServerVersion;
+    }
+
+    /**
+     * Get list of databases on target server.
+     *
+     * @return the databases value
+     */
+    public List<String> databases() {
+        return this.databases;
+    }
+
+    /**
+     * Get target server brand version.
+     *
+     * @return the targetServerBrandVersion value
+     */
+    public String targetServerBrandVersion() {
+        return this.targetServerBrandVersion;
+    }
+
+    /**
+     * Get validation errors associated with the task.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.java
new file mode 100644
index 000000000000..5634c372d5fe
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that validates connection to Azure Database For
+ * PostgreSQL server and target server requirements for online migration.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.class)
+@JsonTypeName("ConnectToTarget.AzureDbForPostgreSql.Sync")
+public class ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private ConnectToTargetAzureDbForPostgreSqlSyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectToTargetAzureDbForPostgreSqlSyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public ConnectToTargetAzureDbForPostgreSqlSyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties object itself.
+     */
+    public ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties withInput(ConnectToTargetAzureDbForPostgreSqlSyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<ConnectToTargetAzureDbForPostgreSqlSyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput.java
new file mode 100644
index 000000000000..f682bd71f8c2
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that validates connection to Azure Database for
+ * PostgreSQL and target server requirements for Oracle source.
+ */
+public class ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput {
+    /**
+     * Connection information for target Azure Database for PostgreSQL server.
+     */
+    @JsonProperty(value = "targetConnectionInfo", required = true)
+    private PostgreSqlConnectionInfo targetConnectionInfo;
+
+    /**
+     * Get connection information for target Azure Database for PostgreSQL server.
+     *
+     * @return the targetConnectionInfo value
+     */
+    public PostgreSqlConnectionInfo targetConnectionInfo() {
+        return this.targetConnectionInfo;
+    }
+
+    /**
+     * Set connection information for target Azure Database for PostgreSQL server.
+     *
+     * @param targetConnectionInfo the targetConnectionInfo value to set
+     * @return the ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput object itself.
+     */
+    public ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput withTargetConnectionInfo(PostgreSqlConnectionInfo targetConnectionInfo) {
+        this.targetConnectionInfo = targetConnectionInfo;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput.java
new file mode 100644
index 000000000000..775112b5ae41
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the task that validates connection to Azure Database for
+ * PostgreSQL and target server requirements for Oracle source.
+ */
+public class ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput {
+    /**
+     * Version of the target server.
+     */
+    @JsonProperty(value = "targetServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerVersion;
+
+    /**
+     * List of databases on target server.
+     */
+    @JsonProperty(value = "databases", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> databases;
+
+    /**
+     * Target server brand version.
+     */
+    @JsonProperty(value = "targetServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerBrandVersion;
+
+    /**
+     * Validation errors associated with the task.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Mapping of schemas per database.
+     */
+    @JsonProperty(value = "databaseSchemaMap")
+    private List<ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem> databaseSchemaMap;
+
+    /**
+     * Get version of the target server.
+     *
+     * @return the targetServerVersion value
+     */
+    public String targetServerVersion() {
+        return this.targetServerVersion;
+    }
+
+    /**
+     * Get list of databases on target server.
+     *
+     * @return the databases value
+     */
+    public List<String> databases() {
+        return this.databases;
+    }
+
+    /**
+     * Get target server brand version.
+     *
+     * @return the targetServerBrandVersion value
+     */
+    public String targetServerBrandVersion() {
+        return this.targetServerBrandVersion;
+    }
+
+    /**
+     * Get validation errors associated with the task.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+    /**
+     * Get mapping of schemas per database.
+     *
+     * @return the databaseSchemaMap value
+     */
+    public List<ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem> databaseSchemaMap() {
+        return this.databaseSchemaMap;
+    }
+
+    /**
+     * Set mapping of schemas per database.
+     *
+     * @param databaseSchemaMap the databaseSchemaMap value to set
+     * @return the ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput object itself.
+     */
+    public ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput withDatabaseSchemaMap(List<ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem> databaseSchemaMap) {
+        this.databaseSchemaMap = databaseSchemaMap;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem.java
new file mode 100644
index 000000000000..2d43d5a735ba
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The
+ * ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem
+ * model.
+ */
+public class ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem {
+    /**
+     * The database property.
+     */
+    @JsonProperty(value = "database")
+    private String database;
+
+    /**
+     * The schemas property.
+     */
+    @JsonProperty(value = "schemas")
+    private List<String> schemas;
+
+    /**
+     * Get the database value.
+     *
+     * @return the database value
+     */
+    public String database() {
+        return this.database;
+    }
+
+    /**
+     * Set the database value.
+     *
+     * @param database the database value to set
+     * @return the ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem object itself.
+     */
+    public ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem withDatabase(String database) {
+        this.database = database;
+        return this;
+    }
+
+    /**
+     * Get the schemas value.
+     *
+     * @return the schemas value
+     */
+    public List<String> schemas() {
+        return this.schemas;
+    }
+
+    /**
+     * Set the schemas value.
+     *
+     * @param schemas the schemas value to set
+     * @return the ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem object itself.
+     */
+    public ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutputDatabaseSchemaMapItem withSchemas(List<String> schemas) {
+        this.schemas = schemas;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.java
new file mode 100644
index 000000000000..871ab0a66616
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that validates connection to Azure Database For
+ * PostgreSQL server and target server requirements for online migration for
+ * Oracle source.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.class)
+@JsonTypeName("ConnectToTarget.Oracle.AzureDbForPostgreSql.Sync")
+public class ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties object itself.
+     */
+    public ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties withInput(ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlDbTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlDbTaskProperties.java
index 41bf8703326e..f1e95979af9a 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlDbTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlDbTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to SQL DB and target
  * server requirements.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetSqlDbTaskProperties.class)
 @JsonTypeName("ConnectToTarget.SqlDb")
 public class ConnectToTargetSqlDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskInput.java
new file mode 100644
index 000000000000..ca40c9b0f243
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that validates connection to Azure SQL Database Managed
+ * Instance online scenario.
+ */
+public class ConnectToTargetSqlMISyncTaskInput {
+    /**
+     * Connection information for Azure SQL Database Managed Instance.
+     */
+    @JsonProperty(value = "targetConnectionInfo", required = true)
+    private MiSqlConnectionInfo targetConnectionInfo;
+
+    /**
+     * Azure Active Directory Application the DMS instance will use to connect
+     * to the target instance of Azure SQL Database Managed Instance and the
+     * Azure Storage Account.
+     */
+    @JsonProperty(value = "azureApp", required = true)
+    private AzureActiveDirectoryApp azureApp;
+
+    /**
+     * Get connection information for Azure SQL Database Managed Instance.
+     *
+     * @return the targetConnectionInfo value
+     */
+    public MiSqlConnectionInfo targetConnectionInfo() {
+        return this.targetConnectionInfo;
+    }
+
+    /**
+     * Set connection information for Azure SQL Database Managed Instance.
+     *
+     * @param targetConnectionInfo the targetConnectionInfo value to set
+     * @return the ConnectToTargetSqlMISyncTaskInput object itself.
+     */
+    public ConnectToTargetSqlMISyncTaskInput withTargetConnectionInfo(MiSqlConnectionInfo targetConnectionInfo) {
+        this.targetConnectionInfo = targetConnectionInfo;
+        return this;
+    }
+
+    /**
+     * Get azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account.
+     *
+     * @return the azureApp value
+     */
+    public AzureActiveDirectoryApp azureApp() {
+        return this.azureApp;
+    }
+
+    /**
+     * Set azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account.
+     *
+     * @param azureApp the azureApp value to set
+     * @return the ConnectToTargetSqlMISyncTaskInput object itself.
+     */
+    public ConnectToTargetSqlMISyncTaskInput withAzureApp(AzureActiveDirectoryApp azureApp) {
+        this.azureApp = azureApp;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskOutput.java
new file mode 100644
index 000000000000..76fed29c64ca
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the task that validates connection to Azure SQL Database Managed
+ * Instance.
+ */
+public class ConnectToTargetSqlMISyncTaskOutput {
+    /**
+     * Target server version.
+     */
+    @JsonProperty(value = "targetServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerVersion;
+
+    /**
+     * Target server brand version.
+     */
+    @JsonProperty(value = "targetServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerBrandVersion;
+
+    /**
+     * Validation errors.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get target server version.
+     *
+     * @return the targetServerVersion value
+     */
+    public String targetServerVersion() {
+        return this.targetServerVersion;
+    }
+
+    /**
+     * Get target server brand version.
+     *
+     * @return the targetServerBrandVersion value
+     */
+    public String targetServerBrandVersion() {
+        return this.targetServerBrandVersion;
+    }
+
+    /**
+     * Get validation errors.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskProperties.java
new file mode 100644
index 000000000000..e519cb6fc76a
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMISyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that validates connection to Azure SQL Database
+ * Managed Instance.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetSqlMISyncTaskProperties.class)
+@JsonTypeName("ConnectToTarget.AzureSqlDbMI.Sync.LRS")
+public class ConnectToTargetSqlMISyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private ConnectToTargetSqlMISyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ConnectToTargetSqlMISyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public ConnectToTargetSqlMISyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the ConnectToTargetSqlMISyncTaskProperties object itself.
+     */
+    public ConnectToTargetSqlMISyncTaskProperties withInput(ConnectToTargetSqlMISyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<ConnectToTargetSqlMISyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskInput.java
index c272b707524f..725c16c1cfad 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskInput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskInput.java
@@ -21,6 +21,25 @@ public class ConnectToTargetSqlMITaskInput {
     @JsonProperty(value = "targetConnectionInfo", required = true)
     private SqlConnectionInfo targetConnectionInfo;
 
+    /**
+     * Flag for whether to collect logins from target SQL MI server.
+     */
+    @JsonProperty(value = "collectLogins")
+    private Boolean collectLogins;
+
+    /**
+     * Flag for whether to collect agent jobs from target SQL MI server.
+     */
+    @JsonProperty(value = "collectAgentJobs")
+    private Boolean collectAgentJobs;
+
+    /**
+     * Flag for whether to validate SSIS catalog is reachable on the target SQL
+     * MI server.
+     */
+    @JsonProperty(value = "validateSsisCatalogOnly")
+    private Boolean validateSsisCatalogOnly;
+
     /**
      * Get connection information for target SQL Server.
      *
@@ -41,4 +60,64 @@ public ConnectToTargetSqlMITaskInput withTargetConnectionInfo(SqlConnectionInfo
         return this;
     }
 
+    /**
+     * Get flag for whether to collect logins from target SQL MI server.
+     *
+     * @return the collectLogins value
+     */
+    public Boolean collectLogins() {
+        return this.collectLogins;
+    }
+
+    /**
+     * Set flag for whether to collect logins from target SQL MI server.
+     *
+     * @param collectLogins the collectLogins value to set
+     * @return the ConnectToTargetSqlMITaskInput object itself.
+     */
+    public ConnectToTargetSqlMITaskInput withCollectLogins(Boolean collectLogins) {
+        this.collectLogins = collectLogins;
+        return this;
+    }
+
+    /**
+     * Get flag for whether to collect agent jobs from target SQL MI server.
+     *
+     * @return the collectAgentJobs value
+     */
+    public Boolean collectAgentJobs() {
+        return this.collectAgentJobs;
+    }
+
+    /**
+     * Set flag for whether to collect agent jobs from target SQL MI server.
+     *
+     * @param collectAgentJobs the collectAgentJobs value to set
+     * @return the ConnectToTargetSqlMITaskInput object itself.
+     */
+    public ConnectToTargetSqlMITaskInput withCollectAgentJobs(Boolean collectAgentJobs) {
+        this.collectAgentJobs = collectAgentJobs;
+        return this;
+    }
+
+    /**
+     * Get flag for whether to validate SSIS catalog is reachable on the target SQL MI server.
+     *
+     * @return the validateSsisCatalogOnly value
+     */
+    public Boolean validateSsisCatalogOnly() {
+        return this.validateSsisCatalogOnly;
+    }
+
+    /**
+     * Set flag for whether to validate SSIS catalog is reachable on the target SQL MI server.
+     *
+     * @param validateSsisCatalogOnly the validateSsisCatalogOnly value to set
+     * @return the ConnectToTargetSqlMITaskInput object itself.
+     */
+    public ConnectToTargetSqlMITaskInput withValidateSsisCatalogOnly(Boolean validateSsisCatalogOnly) {
+        this.validateSsisCatalogOnly = validateSsisCatalogOnly;
+        return this;
+    }
+
 }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskProperties.java
index faea27badcd5..2e607944fb82 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlMITaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to Azure SQL Database
  * Managed Instance.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetSqlMITaskProperties.class)
 @JsonTypeName("ConnectToTarget.AzureSqlDbMI")
 public class ConnectToTargetSqlMITaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlSqlDbSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlSqlDbSyncTaskProperties.java
index a9f1f370bc61..b888fe78181c 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlSqlDbSyncTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectToTargetSqlSqlDbSyncTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates connection to SQL DB and target
  * server requirements for online migration.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetSqlSqlDbSyncTaskProperties.class)
 @JsonTypeName("ConnectToTarget.SqlDb.Sync")
 public class ConnectToTargetSqlSqlDbSyncTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectionInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectionInfo.java
index 66a77d7439ff..79d4024da87f 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectionInfo.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ConnectionInfo.java
@@ -16,30 +16,45 @@
 /**
  * Defines the connection properties of a server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = ConnectionInfo.class)
 @JsonTypeName("Unknown")
 @JsonSubTypes({
+    @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureDbSqlMi.Complete", value = MigrateMISyncCompleteCommandProperties.class),
     @JsonSubTypes.Type(name = "Migrate.Sync.Complete.Database", value = MigrateSyncCompleteCommandProperties.class),
+    @JsonSubTypes.Type(name = "MiSqlConnectionInfo", value = MiSqlConnectionInfo.class),
     @JsonSubTypes.Type(name = "PostgreSqlConnectionInfo", value = PostgreSqlConnectionInfo.class),
+    @JsonSubTypes.Type(name = "OracleConnectionInfo", value = OracleConnectionInfo.class),
     @JsonSubTypes.Type(name = "MySqlConnectionInfo", value = MySqlConnectionInfo.class),
     @JsonSubTypes.Type(name = "MongoDbConnectionInfo", value = MongoDbConnectionInfo.class),
     @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class),
+    @JsonSubTypes.Type(name = "Migrate.Ssis", value = MigrateSsisTaskProperties.class),
     @JsonSubTypes.Type(name = "GetTDECertificates.Sql", value = GetTdeCertificatesSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "Validate.Oracle.AzureDbPostgreSql.Sync", value = ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Validate.MongoDb", value = ValidateMongoDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI.Sync.LRS", value = ValidateMigrationInputSqlServerSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI", value = ValidateMigrationInputSqlServerSqlMITaskProperties.class),
     @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.SqlDb.Sync", value = ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "Migrate.Oracle.AzureDbForPostgreSql.Sync", value = MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.PostgreSql.AzureDbForPostgreSql.Sync", value = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.MySql.AzureDbForMySql.Sync", value = MigrateMySqlAzureDbForMySqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDb.Sync", value = MigrateSqlServerSqlDbSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.SqlDb", value = MigrateSqlServerSqlDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI.Sync.LRS", value = MigrateSqlServerSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI", value = MigrateSqlServerSqlMITaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.MongoDb", value = MigrateMongoDbTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.AzureDbForMySql", value = ConnectToTargetAzureDbForMySqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.AzureSqlDbMI.Sync.LRS", value = ConnectToTargetSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.AzureSqlDbMI", value = ConnectToTargetSqlMITaskProperties.class),
+    @JsonSubTypes.Type(name = "GetUserTablesPostgreSql", value = GetUserTablesPostgreSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "GetUserTablesOracle", value = GetUserTablesOracleTaskProperties.class),
     @JsonSubTypes.Type(name = "GetUserTables.AzureSqlDb.Sync", value = GetUserTablesSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "GetUserTables.Sql", value = GetUserTablesSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.Oracle.AzureDbForPostgreSql.Sync", value = ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.AzureDbForPostgreSql.Sync", value = ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb.Sync", value = ConnectToTargetSqlSqlDbSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb", value = ConnectToTargetSqlDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToSource.Oracle.Sync", value = ConnectToSourceOracleSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToSource.PostgreSql.Sync", value = ConnectToSourcePostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToSource.SqlServer.Sync", value = ConnectToSourceSqlServerSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToSource.SqlServer", value = ConnectToSourceSqlServerTaskProperties.class),
     @JsonSubTypes.Type(name = "Connect.MongoDb", value = ConnectToMongoDbTaskProperties.class),
@@ -47,7 +62,10 @@
     @JsonSubTypes.Type(name = "MigrateSchemaSqlServerSqlDb", value = MigrateSchemaSqlServerSqlDbTaskProperties.class),
     @JsonSubTypes.Type(name = "cancel", value = MongoDbCancelCommand.class),
     @JsonSubTypes.Type(name = "finish", value = MongoDbFinishCommand.class),
-    @JsonSubTypes.Type(name = "restart", value = MongoDbRestartCommand.class)
+    @JsonSubTypes.Type(name = "restart", value = MongoDbRestartCommand.class),
+    @JsonSubTypes.Type(name = "Service.Check.OCI", value = CheckOCIDriverTaskProperties.class),
+    @JsonSubTypes.Type(name = "Service.Upload.OCI", value = UploadOCIDriverTaskProperties.class),
+    @JsonSubTypes.Type(name = "Service.Install.OCI", value = InstallOCIDriverTaskProperties.class)
 })
 public class ConnectionInfo {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/DatabaseMigrationState.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/DatabaseMigrationState.java
new file mode 100644
index 000000000000..62fd134648ac
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/DatabaseMigrationState.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DatabaseMigrationState.
+ */
+public final class DatabaseMigrationState extends ExpandableStringEnum<DatabaseMigrationState> {
+    /** Static value UNDEFINED for DatabaseMigrationState. */
+    public static final DatabaseMigrationState UNDEFINED = fromString("UNDEFINED");
+
+    /** Static value INITIAL for DatabaseMigrationState. */
+    public static final DatabaseMigrationState INITIAL = fromString("INITIAL");
+
+    /** Static value FULL_BACKUP_UPLOAD_START for DatabaseMigrationState. */
+    public static final DatabaseMigrationState FULL_BACKUP_UPLOAD_START = fromString("FULL_BACKUP_UPLOAD_START");
+
+    /** Static value LOG_SHIPPING_START for DatabaseMigrationState. */
+    public static final DatabaseMigrationState LOG_SHIPPING_START = fromString("LOG_SHIPPING_START");
+
+    /** Static value UPLOAD_LOG_FILES_START for DatabaseMigrationState. */
+    public static final DatabaseMigrationState UPLOAD_LOG_FILES_START = fromString("UPLOAD_LOG_FILES_START");
+
+    /** Static value CUTOVER_START for DatabaseMigrationState. */
+    public static final DatabaseMigrationState CUTOVER_START = fromString("CUTOVER_START");
+
+    /** Static value POST_CUTOVER_COMPLETE for DatabaseMigrationState. */
+    public static final DatabaseMigrationState POST_CUTOVER_COMPLETE = fromString("POST_CUTOVER_COMPLETE");
+
+    /** Static value COMPLETED for DatabaseMigrationState. */
+    public static final DatabaseMigrationState COMPLETED = fromString("COMPLETED");
+
+    /** Static value CANCELLED for DatabaseMigrationState. */
+    public static final DatabaseMigrationState CANCELLED = fromString("CANCELLED");
+
+    /** Static value FAILED for DatabaseMigrationState. */
+    public static final DatabaseMigrationState FAILED = fromString("FAILED");
+
+    /**
+     * Creates or finds a DatabaseMigrationState from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DatabaseMigrationState
+     */
+    @JsonCreator
+    public static DatabaseMigrationState fromString(String name) {
+        return fromString(name, DatabaseMigrationState.class);
+    }
+
+    /**
+     * @return known DatabaseMigrationState values
+     */
+    public static Collection<DatabaseMigrationState> values() {
+        return values(DatabaseMigrationState.class);
+    }
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetTdeCertificatesSqlTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetTdeCertificatesSqlTaskProperties.java
index 859c4d2e44e7..0c8521e017be 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetTdeCertificatesSqlTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetTdeCertificatesSqlTaskProperties.java
@@ -16,7 +16,7 @@
 /**
  * Properties for the task that gets TDE certificates in Base64 encoded format.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = GetTdeCertificatesSqlTaskProperties.class)
 @JsonTypeName("GetTDECertificates.Sql")
 public class GetTdeCertificatesSqlTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskInput.java
new file mode 100644
index 000000000000..9272e4a781a4
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskInput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that gets the list of tables contained within a provided
+ * list of Oracle schemas.
+ */
+public class GetUserTablesOracleTaskInput {
+    /**
+     * Information for connecting to Oracle source.
+     */
+    @JsonProperty(value = "connectionInfo", required = true)
+    private OracleConnectionInfo connectionInfo;
+
+    /**
+     * List of Oracle schemas for which to collect tables.
+     */
+    @JsonProperty(value = "selectedSchemas", required = true)
+    private List<String> selectedSchemas;
+
+    /**
+     * Get information for connecting to Oracle source.
+     *
+     * @return the connectionInfo value
+     */
+    public OracleConnectionInfo connectionInfo() {
+        return this.connectionInfo;
+    }
+
+    /**
+     * Set information for connecting to Oracle source.
+     *
+     * @param connectionInfo the connectionInfo value to set
+     * @return the GetUserTablesOracleTaskInput object itself.
+     */
+    public GetUserTablesOracleTaskInput withConnectionInfo(OracleConnectionInfo connectionInfo) {
+        this.connectionInfo = connectionInfo;
+        return this;
+    }
+
+    /**
+     * Get list of Oracle schemas for which to collect tables.
+     *
+     * @return the selectedSchemas value
+     */
+    public List<String> selectedSchemas() {
+        return this.selectedSchemas;
+    }
+
+    /**
+     * Set list of Oracle schemas for which to collect tables.
+     *
+     * @param selectedSchemas the selectedSchemas value to set
+     * @return the GetUserTablesOracleTaskInput object itself.
+     */
+    public GetUserTablesOracleTaskInput withSelectedSchemas(List<String> selectedSchemas) {
+        this.selectedSchemas = selectedSchemas;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskOutput.java
new file mode 100644
index 000000000000..969b4e2e4d07
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the task that gets the list of tables contained within a provided
+ * list of Oracle schemas.
+ */
+public class GetUserTablesOracleTaskOutput {
+    /**
+     * The schema this result is for.
+     */
+    @JsonProperty(value = "schemaName", access = JsonProperty.Access.WRITE_ONLY)
+    private String schemaName;
+
+    /**
+     * List of valid tables found for this schema.
+     */
+    @JsonProperty(value = "tables", access = JsonProperty.Access.WRITE_ONLY)
+    private List<DatabaseTable> tables;
+
+    /**
+     * Validation errors associated with the task.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get the schema this result is for.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Get list of valid tables found for this schema.
+     *
+     * @return the tables value
+     */
+    public List<DatabaseTable> tables() {
+        return this.tables;
+    }
+
+    /**
+     * Get validation errors associated with the task.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskProperties.java
new file mode 100644
index 000000000000..f4cf0aae0b76
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesOracleTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that collects user tables for the given list of
+ * Oracle schemas.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = GetUserTablesOracleTaskProperties.class)
+@JsonTypeName("GetUserTablesOracle")
+public class GetUserTablesOracleTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private GetUserTablesOracleTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<GetUserTablesOracleTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public GetUserTablesOracleTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the GetUserTablesOracleTaskProperties object itself.
+     */
+    public GetUserTablesOracleTaskProperties withInput(GetUserTablesOracleTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<GetUserTablesOracleTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskInput.java
new file mode 100644
index 000000000000..9732d6b6ad08
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskInput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that gets the list of tables for a provided list of
+ * PostgreSQL databases.
+ */
+public class GetUserTablesPostgreSqlTaskInput {
+    /**
+     * Information for connecting to PostgreSQL source.
+     */
+    @JsonProperty(value = "connectionInfo", required = true)
+    private PostgreSqlConnectionInfo connectionInfo;
+
+    /**
+     * List of PostgreSQL databases for which to collect tables.
+     */
+    @JsonProperty(value = "selectedDatabases", required = true)
+    private List<String> selectedDatabases;
+
+    /**
+     * Get information for connecting to PostgreSQL source.
+     *
+     * @return the connectionInfo value
+     */
+    public PostgreSqlConnectionInfo connectionInfo() {
+        return this.connectionInfo;
+    }
+
+    /**
+     * Set information for connecting to PostgreSQL source.
+     *
+     * @param connectionInfo the connectionInfo value to set
+     * @return the GetUserTablesPostgreSqlTaskInput object itself.
+     */
+    public GetUserTablesPostgreSqlTaskInput withConnectionInfo(PostgreSqlConnectionInfo connectionInfo) {
+        this.connectionInfo = connectionInfo;
+        return this;
+    }
+
+    /**
+     * Get list of PostgreSQL databases for which to collect tables.
+     *
+     * @return the selectedDatabases value
+     */
+    public List<String> selectedDatabases() {
+        return this.selectedDatabases;
+    }
+
+    /**
+     * Set list of PostgreSQL databases for which to collect tables.
+     *
+     * @param selectedDatabases the selectedDatabases value to set
+     * @return the GetUserTablesPostgreSqlTaskInput object itself.
+     */
+    public GetUserTablesPostgreSqlTaskInput withSelectedDatabases(List<String> selectedDatabases) {
+        this.selectedDatabases = selectedDatabases;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskOutput.java
new file mode 100644
index 000000000000..e191a82a6162
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the task that gets the list of tables for a provided list of
+ * PostgreSQL databases.
+ */
+public class GetUserTablesPostgreSqlTaskOutput {
+    /**
+     * The database this result is for.
+     */
+    @JsonProperty(value = "databaseName", access = JsonProperty.Access.WRITE_ONLY)
+    private String databaseName;
+
+    /**
+     * List of valid tables found for this database.
+     */
+    @JsonProperty(value = "tables", access = JsonProperty.Access.WRITE_ONLY)
+    private List<DatabaseTable> tables;
+
+    /**
+     * Validation errors associated with the task.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get the database this result is for.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Get list of valid tables found for this database.
+     *
+     * @return the tables value
+     */
+    public List<DatabaseTable> tables() {
+        return this.tables;
+    }
+
+    /**
+     * Get validation errors associated with the task.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskProperties.java
new file mode 100644
index 000000000000..e96ec1e90903
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesPostgreSqlTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that collects user tables for the given list of
+ * databases.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = GetUserTablesPostgreSqlTaskProperties.class)
+@JsonTypeName("GetUserTablesPostgreSql")
+public class GetUserTablesPostgreSqlTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private GetUserTablesPostgreSqlTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<GetUserTablesPostgreSqlTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public GetUserTablesPostgreSqlTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the GetUserTablesPostgreSqlTaskProperties object itself.
+     */
+    public GetUserTablesPostgreSqlTaskProperties withInput(GetUserTablesPostgreSqlTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<GetUserTablesPostgreSqlTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlSyncTaskProperties.java
index 6fc255df11d1..c5403146628a 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlSyncTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlSyncTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that collects user tables for the given list of
  * databases.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = GetUserTablesSqlSyncTaskProperties.class)
 @JsonTypeName("GetUserTables.AzureSqlDb.Sync")
 public class GetUserTablesSqlSyncTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlTaskProperties.java
index d3e975fd41b5..21e987b48f37 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/GetUserTablesSqlTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that collects user tables for the given list of
  * databases.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = GetUserTablesSqlTaskProperties.class)
 @JsonTypeName("GetUserTables.Sql")
 public class GetUserTablesSqlTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskInput.java
new file mode 100644
index 000000000000..39e15dc30224
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the service task to install an OCI driver.
+ */
+public class InstallOCIDriverTaskInput {
+    /**
+     * Name of the uploaded driver package to install.
+     */
+    @JsonProperty(value = "driverPackageName")
+    private String driverPackageName;
+
+    /**
+     * Get name of the uploaded driver package to install.
+     *
+     * @return the driverPackageName value
+     */
+    public String driverPackageName() {
+        return this.driverPackageName;
+    }
+
+    /**
+     * Set name of the uploaded driver package to install.
+     *
+     * @param driverPackageName the driverPackageName value to set
+     * @return the InstallOCIDriverTaskInput object itself.
+     */
+    public InstallOCIDriverTaskInput withDriverPackageName(String driverPackageName) {
+        this.driverPackageName = driverPackageName;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskOutput.java
new file mode 100644
index 000000000000..8fee73903a3e
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the service task to install an OCI driver.
+ */
+public class InstallOCIDriverTaskOutput {
+    /**
+     * Validation errors.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get validation errors.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskProperties.java
new file mode 100644
index 000000000000..86443cf43865
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/InstallOCIDriverTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that installs an OCI driver.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = InstallOCIDriverTaskProperties.class)
+@JsonTypeName("Service.Install.OCI")
+public class InstallOCIDriverTaskProperties extends ProjectTaskProperties {
+    /**
+     * The input property.
+     */
+    @JsonProperty(value = "input")
+    private InstallOCIDriverTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<InstallOCIDriverTaskOutput> output;
+
+    /**
+     * Get the input value.
+     *
+     * @return the input value
+     */
+    public InstallOCIDriverTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set the input value.
+     *
+     * @param input the input value to set
+     * @return the InstallOCIDriverTaskProperties object itself.
+     */
+    public InstallOCIDriverTaskProperties withInput(InstallOCIDriverTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<InstallOCIDriverTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MiSqlConnectionInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MiSqlConnectionInfo.java
new file mode 100644
index 000000000000..0c68a37e473b
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MiSqlConnectionInfo.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties required to create a connection to Azure SQL database Managed
+ * instance.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = MiSqlConnectionInfo.class)
+@JsonTypeName("MiSqlConnectionInfo")
+public class MiSqlConnectionInfo extends ConnectionInfo {
+    /**
+     * Resource id for Azure SQL database Managed instance.
+     */
+    @JsonProperty(value = "managedInstanceResourceId", required = true)
+    private String managedInstanceResourceId;
+
+    /**
+     * Get resource id for Azure SQL database Managed instance.
+     *
+     * @return the managedInstanceResourceId value
+     */
+    public String managedInstanceResourceId() {
+        return this.managedInstanceResourceId;
+    }
+
+    /**
+     * Set resource id for Azure SQL database Managed instance.
+     *
+     * @param managedInstanceResourceId the managedInstanceResourceId value to set
+     * @return the MiSqlConnectionInfo object itself.
+     */
+    public MiSqlConnectionInfo withManagedInstanceResourceId(String managedInstanceResourceId) {
+        this.managedInstanceResourceId = managedInstanceResourceId;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandInput.java
new file mode 100644
index 000000000000..6086851bc836
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for command that completes online migration for an Azure SQL Database
+ * Managed Instance.
+ */
+public class MigrateMISyncCompleteCommandInput {
+    /**
+     * Name of managed instance database.
+     */
+    @JsonProperty(value = "sourceDatabaseName", required = true)
+    private String sourceDatabaseName;
+
+    /**
+     * Get name of managed instance database.
+     *
+     * @return the sourceDatabaseName value
+     */
+    public String sourceDatabaseName() {
+        return this.sourceDatabaseName;
+    }
+
+    /**
+     * Set name of managed instance database.
+     *
+     * @param sourceDatabaseName the sourceDatabaseName value to set
+     * @return the MigrateMISyncCompleteCommandInput object itself.
+     */
+    public MigrateMISyncCompleteCommandInput withSourceDatabaseName(String sourceDatabaseName) {
+        this.sourceDatabaseName = sourceDatabaseName;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandOutput.java
new file mode 100644
index 000000000000..b41de92b4891
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for command that completes online migration for an Azure SQL Database
+ * Managed Instance.
+ */
+public class MigrateMISyncCompleteCommandOutput {
+    /**
+     * List of errors that happened during the command execution.
+     */
+    @JsonProperty(value = "errors")
+    private List<ReportableException> errors;
+
+    /**
+     * Get list of errors that happened during the command execution.
+     *
+     * @return the errors value
+     */
+    public List<ReportableException> errors() {
+        return this.errors;
+    }
+
+    /**
+     * Set list of errors that happened during the command execution.
+     *
+     * @param errors the errors value to set
+     * @return the MigrateMISyncCompleteCommandOutput object itself.
+     */
+    public MigrateMISyncCompleteCommandOutput withErrors(List<ReportableException> errors) {
+        this.errors = errors;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandProperties.java
new file mode 100644
index 000000000000..b694c2c81168
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMISyncCompleteCommandProperties.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.implementation.CommandPropertiesInner;
+
+/**
+ * Properties for the command that completes online migration for an Azure SQL
+ * Database Managed Instance.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType", defaultImpl = MigrateMISyncCompleteCommandProperties.class)
+@JsonTypeName("Migrate.SqlServer.AzureDbSqlMi.Complete")
+public class MigrateMISyncCompleteCommandProperties extends CommandPropertiesInner {
+    /**
+     * Command input.
+     */
+    @JsonProperty(value = "input")
+    private MigrateMISyncCompleteCommandInput input;
+
+    /**
+     * Command output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private MigrateMISyncCompleteCommandOutput output;
+
+    /**
+     * Get command input.
+     *
+     * @return the input value
+     */
+    public MigrateMISyncCompleteCommandInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set command input.
+     *
+     * @param input the input value to set
+     * @return the MigrateMISyncCompleteCommandProperties object itself.
+     */
+    public MigrateMISyncCompleteCommandProperties withInput(MigrateMISyncCompleteCommandInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get command output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public MigrateMISyncCompleteCommandOutput output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMongoDbTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMongoDbTaskProperties.java
index 3783388278f6..0a05721e7f53 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMongoDbTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMongoDbTaskProperties.java
@@ -16,7 +16,7 @@
 /**
  * Properties for the task that migrates data between MongoDB data sources.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateMongoDbTaskProperties.class)
 @JsonTypeName("Migrate.MongoDb")
 public class MigrateMongoDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncDatabaseInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncDatabaseInput.java
index 9c6511a2ddb2..afb4df949796 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncDatabaseInput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncDatabaseInput.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
 
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -28,6 +29,24 @@ public class MigrateMySqlAzureDbForMySqlSyncDatabaseInput {
     @JsonProperty(value = "targetDatabaseName")
     private String targetDatabaseName;
 
+    /**
+     * Migration settings which tune the migration behavior.
+     */
+    @JsonProperty(value = "migrationSetting")
+    private Map<String, String> migrationSetting;
+
+    /**
+     * Source settings to tune source endpoint migration behavior.
+     */
+    @JsonProperty(value = "sourceSetting")
+    private Map<String, String> sourceSetting;
+
+    /**
+     * Target settings to tune target endpoint migration behavior.
+     */
+    @JsonProperty(value = "targetSetting")
+    private Map<String, String> targetSetting;
+
     /**
      * Get name of the database.
      *
@@ -68,4 +87,64 @@ public MigrateMySqlAzureDbForMySqlSyncDatabaseInput withTargetDatabaseName(Strin
         return this;
     }
 
+    /**
+     * Get migration settings which tune the migration behavior.
+     *
+     * @return the migrationSetting value
+     */
+    public Map<String, String> migrationSetting() {
+        return this.migrationSetting;
+    }
+
+    /**
+     * Set migration settings which tune the migration behavior.
+     *
+     * @param migrationSetting the migrationSetting value to set
+     * @return the MigrateMySqlAzureDbForMySqlSyncDatabaseInput object itself.
+     */
+    public MigrateMySqlAzureDbForMySqlSyncDatabaseInput withMigrationSetting(Map<String, String> migrationSetting) {
+        this.migrationSetting = migrationSetting;
+        return this;
+    }
+
+    /**
+     * Get source settings to tune source endpoint migration behavior.
+     *
+     * @return the sourceSetting value
+     */
+    public Map<String, String> sourceSetting() {
+        return this.sourceSetting;
+    }
+
+    /**
+     * Set source settings to tune source endpoint migration behavior.
+     *
+     * @param sourceSetting the sourceSetting value to set
+     * @return the MigrateMySqlAzureDbForMySqlSyncDatabaseInput object itself.
+     */
+    public MigrateMySqlAzureDbForMySqlSyncDatabaseInput withSourceSetting(Map<String, String> sourceSetting) {
+        this.sourceSetting = sourceSetting;
+        return this;
+    }
+
+    /**
+     * Get target settings to tune target endpoint migration behavior.
+     *
+     * @return the targetSetting value
+     */
+    public Map<String, String> targetSetting() {
+        return this.targetSetting;
+    }
+
+    /**
+     * Set target settings to tune target endpoint migration behavior.
+     *
+     * @param targetSetting the targetSetting value to set
+     * @return the MigrateMySqlAzureDbForMySqlSyncDatabaseInput object itself.
+     */
+    public MigrateMySqlAzureDbForMySqlSyncDatabaseInput withTargetSetting(Map<String, String> targetSetting) {
+        this.targetSetting = targetSetting;
+        return this;
+    }
+
 }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutput.java
index 65519021593f..adab82444daa 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that migrates MySQL databases to Azure Database for
  * MySQL for online migrations.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateMySqlAzureDbForMySqlSyncTaskOutput.class)
 @JsonTypeName("MigrateMySqlAzureDbForMySqlSyncTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "DatabaseLevelErrorOutput", value = MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError.class),
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError.java
index 75a8a0837b7b..49cbcc1b03f7 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError.class)
 @JsonTypeName("DatabaseLevelErrorOutput")
 public class MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseError extends MigrateMySqlAzureDbForMySqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseLevel.java
index 54e7ede733d7..5e9ef0029d43 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class MigrateMySqlAzureDbForMySqlSyncTaskOutputDatabaseLevel extends MigrateMySqlAzureDbForMySqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputError.java
index c6f586d45a32..9633409eb9ee 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * The MigrateMySqlAzureDbForMySqlSyncTaskOutputError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateMySqlAzureDbForMySqlSyncTaskOutputError.class)
 @JsonTypeName("ErrorOutput")
 public class MigrateMySqlAzureDbForMySqlSyncTaskOutputError extends MigrateMySqlAzureDbForMySqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel.java
index f905f16855a4..fd30236afc58 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel.class)
 @JsonTypeName("MigrationLevelOutput")
 public class MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel extends MigrateMySqlAzureDbForMySqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputTableLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputTableLevel.java
index 10a44aea9873..9b714b311904 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputTableLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskOutputTableLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateMySqlAzureDbForMySqlSyncTaskOutputTableLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateMySqlAzureDbForMySqlSyncTaskOutputTableLevel.class)
 @JsonTypeName("TableLevelOutput")
 public class MigrateMySqlAzureDbForMySqlSyncTaskOutputTableLevel extends MigrateMySqlAzureDbForMySqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskProperties.java
index eb6da201f3af..c2110fb52f59 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateMySqlAzureDbForMySqlSyncTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that migrates MySQL databases to Azure Database for
  * MySQL for online migrations.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateMySqlAzureDbForMySqlSyncTaskProperties.class)
 @JsonTypeName("Migrate.MySql.AzureDbForMySql.Sync")
 public class MigrateMySqlAzureDbForMySqlSyncTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.java
new file mode 100644
index 000000000000..08fa5d22ac40
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that migrates Oracle to Azure Database for
+ * PostgreSQL for online migrations.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.class)
+@JsonTypeName("Migrate.Oracle.AzureDbForPostgreSql.Sync")
+public class MigrateOracleAzureDbForPostgreSqlSyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private MigrateOracleAzureDbPostgreSqlSyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<MigrateOracleAzureDbPostgreSqlSyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the MigrateOracleAzureDbForPostgreSqlSyncTaskProperties object itself.
+     */
+    public MigrateOracleAzureDbForPostgreSqlSyncTaskProperties withInput(MigrateOracleAzureDbPostgreSqlSyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<MigrateOracleAzureDbPostgreSqlSyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncDatabaseInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncDatabaseInput.java
new file mode 100644
index 000000000000..5fddb98cb0f7
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncDatabaseInput.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.datamigration.v2018_07_15_preview;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Database specific information for Oracle to Azure Database for PostgreSQL
+ * migration task inputs.
+ */
+public class MigrateOracleAzureDbPostgreSqlSyncDatabaseInput {
+    /**
+     * How to handle object name casing: either Preserve or ToLower.
+     */
+    @JsonProperty(value = "caseManipulation")
+    private String caseManipulation;
+
+    /**
+     * Name of the migration pipeline.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Name of the source schema.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * Mapping of source to target tables.
+     */
+    @JsonProperty(value = "tableMap")
+    private Map<String, String> tableMap;
+
+    /**
+     * Name of target database. Note: Target database will be truncated before
+     * starting migration.
+     */
+    @JsonProperty(value = "targetDatabaseName")
+    private String targetDatabaseName;
+
+    /**
+     * Migration settings which tune the migration behavior.
+     */
+    @JsonProperty(value = "migrationSetting")
+    private Map<String, String> migrationSetting;
+
+    /**
+     * Source settings to tune source endpoint migration behavior.
+     */
+    @JsonProperty(value = "sourceSetting")
+    private Map<String, String> sourceSetting;
+
+    /**
+     * Target settings to tune target endpoint migration behavior.
+     */
+    @JsonProperty(value = "targetSetting")
+    private Map<String, String> targetSetting;
+
+    /**
+     * Get how to handle object name casing: either Preserve or ToLower.
+     *
+     * @return the caseManipulation value
+     */
+    public String caseManipulation() {
+        return this.caseManipulation;
+    }
+
+    /**
+     * Set how to handle object name casing: either Preserve or ToLower.
+     *
+     * @param caseManipulation the caseManipulation value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withCaseManipulation(String caseManipulation) {
+        this.caseManipulation = caseManipulation;
+        return this;
+    }
+
+    /**
+     * Get name of the migration pipeline.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the migration pipeline.
+     *
+     * @param name the name value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get name of the source schema.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set name of the source schema.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get mapping of source to target tables.
+     *
+     * @return the tableMap value
+     */
+    public Map<String, String> tableMap() {
+        return this.tableMap;
+    }
+
+    /**
+     * Set mapping of source to target tables.
+     *
+     * @param tableMap the tableMap value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withTableMap(Map<String, String> tableMap) {
+        this.tableMap = tableMap;
+        return this;
+    }
+
+    /**
+     * Get name of target database. Note: Target database will be truncated before starting migration.
+     *
+     * @return the targetDatabaseName value
+     */
+    public String targetDatabaseName() {
+        return this.targetDatabaseName;
+    }
+
+    /**
+     * Set name of target database. Note: Target database will be truncated before starting migration.
+     *
+     * @param targetDatabaseName the targetDatabaseName value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withTargetDatabaseName(String targetDatabaseName) {
+        this.targetDatabaseName = targetDatabaseName;
+        return this;
+    }
+
+    /**
+     * Get migration settings which tune the migration behavior.
+     *
+     * @return the migrationSetting value
+     */
+    public Map<String, String> migrationSetting() {
+        return this.migrationSetting;
+    }
+
+    /**
+     * Set migration settings which tune the migration behavior.
+     *
+     * @param migrationSetting the migrationSetting value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withMigrationSetting(Map<String, String> migrationSetting) {
+        this.migrationSetting = migrationSetting;
+        return this;
+    }
+
+    /**
+     * Get source settings to tune source endpoint migration behavior.
+     *
+     * @return the sourceSetting value
+     */
+    public Map<String, String> sourceSetting() {
+        return this.sourceSetting;
+    }
+
+    /**
+     * Set source settings to tune source endpoint migration behavior.
+     *
+     * @param sourceSetting the sourceSetting value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withSourceSetting(Map<String, String> sourceSetting) {
+        this.sourceSetting = sourceSetting;
+        return this;
+    }
+
+    /**
+     * Get target settings to tune target endpoint migration behavior.
+     *
+     * @return the targetSetting value
+     */
+    public Map<String, String> targetSetting() {
+        return this.targetSetting;
+    }
+
+    /**
+     * Set target settings to tune target endpoint migration behavior.
+     *
+     * @param targetSetting the targetSetting value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncDatabaseInput withTargetSetting(Map<String, String> targetSetting) {
+        this.targetSetting = targetSetting;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskInput.java
new file mode 100644
index 000000000000..e71a9f74af8c
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the task that migrates Oracle databases to Azure Database for
+ * PostgreSQL for online migrations.
+ */
+public class MigrateOracleAzureDbPostgreSqlSyncTaskInput {
+    /**
+     * Databases to migrate.
+     */
+    @JsonProperty(value = "selectedDatabases", required = true)
+    private List<MigrateOracleAzureDbPostgreSqlSyncDatabaseInput> selectedDatabases;
+
+    /**
+     * Connection information for target Azure Database for PostgreSQL.
+     */
+    @JsonProperty(value = "targetConnectionInfo", required = true)
+    private PostgreSqlConnectionInfo targetConnectionInfo;
+
+    /**
+     * Connection information for source Oracle.
+     */
+    @JsonProperty(value = "sourceConnectionInfo", required = true)
+    private OracleConnectionInfo sourceConnectionInfo;
+
+    /**
+     * Get databases to migrate.
+     *
+     * @return the selectedDatabases value
+     */
+    public List<MigrateOracleAzureDbPostgreSqlSyncDatabaseInput> selectedDatabases() {
+        return this.selectedDatabases;
+    }
+
+    /**
+     * Set databases to migrate.
+     *
+     * @param selectedDatabases the selectedDatabases value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncTaskInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncTaskInput withSelectedDatabases(List<MigrateOracleAzureDbPostgreSqlSyncDatabaseInput> selectedDatabases) {
+        this.selectedDatabases = selectedDatabases;
+        return this;
+    }
+
+    /**
+     * Get connection information for target Azure Database for PostgreSQL.
+     *
+     * @return the targetConnectionInfo value
+     */
+    public PostgreSqlConnectionInfo targetConnectionInfo() {
+        return this.targetConnectionInfo;
+    }
+
+    /**
+     * Set connection information for target Azure Database for PostgreSQL.
+     *
+     * @param targetConnectionInfo the targetConnectionInfo value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncTaskInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncTaskInput withTargetConnectionInfo(PostgreSqlConnectionInfo targetConnectionInfo) {
+        this.targetConnectionInfo = targetConnectionInfo;
+        return this;
+    }
+
+    /**
+     * Get connection information for source Oracle.
+     *
+     * @return the sourceConnectionInfo value
+     */
+    public OracleConnectionInfo sourceConnectionInfo() {
+        return this.sourceConnectionInfo;
+    }
+
+    /**
+     * Set connection information for source Oracle.
+     *
+     * @param sourceConnectionInfo the sourceConnectionInfo value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncTaskInput object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncTaskInput withSourceConnectionInfo(OracleConnectionInfo sourceConnectionInfo) {
+        this.sourceConnectionInfo = sourceConnectionInfo;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutput.java
new file mode 100644
index 000000000000..042c9e737263
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * Output for the task that migrates Oracle databases to Azure Database for
+ * PostgreSQL for online migrations.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateOracleAzureDbPostgreSqlSyncTaskOutput.class)
+@JsonTypeName("MigrateOracleAzureDbPostgreSqlSyncTaskOutput")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "DatabaseLevelErrorOutput", value = MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError.class),
+    @JsonSubTypes.Type(name = "ErrorOutput", value = MigrateOracleAzureDbPostgreSqlSyncTaskOutputError.class),
+    @JsonSubTypes.Type(name = "TableLevelOutput", value = MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel.class),
+    @JsonSubTypes.Type(name = "DatabaseLevelOutput", value = MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel.class),
+    @JsonSubTypes.Type(name = "MigrationLevelOutput", value = MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel.class)
+})
+public class MigrateOracleAzureDbPostgreSqlSyncTaskOutput {
+    /**
+     * Result identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Get result identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError.java
new file mode 100644
index 000000000000..3cf00268fbc6
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError.class)
+@JsonTypeName("DatabaseLevelErrorOutput")
+public class MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError extends MigrateOracleAzureDbPostgreSqlSyncTaskOutput {
+    /**
+     * Error message.
+     */
+    @JsonProperty(value = "errorMessage")
+    private String errorMessage;
+
+    /**
+     * List of error events.
+     */
+    @JsonProperty(value = "events")
+    private List<SyncMigrationDatabaseErrorEvent> events;
+
+    /**
+     * Get error message.
+     *
+     * @return the errorMessage value
+     */
+    public String errorMessage() {
+        return this.errorMessage;
+    }
+
+    /**
+     * Set error message.
+     *
+     * @param errorMessage the errorMessage value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError withErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+        return this;
+    }
+
+    /**
+     * Get list of error events.
+     *
+     * @return the events value
+     */
+    public List<SyncMigrationDatabaseErrorEvent> events() {
+        return this.events;
+    }
+
+    /**
+     * Set list of error events.
+     *
+     * @param events the events value to set
+     * @return the MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError object itself.
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseError withEvents(List<SyncMigrationDatabaseErrorEvent> events) {
+        this.events = events;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel.java
new file mode 100644
index 000000000000..e95d9e5c96c4
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel.java
@@ -0,0 +1,250 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel.class)
+@JsonTypeName("DatabaseLevelOutput")
+public class MigrateOracleAzureDbPostgreSqlSyncTaskOutputDatabaseLevel extends MigrateOracleAzureDbPostgreSqlSyncTaskOutput {
+    /**
+     * Name of the database.
+     */
+    @JsonProperty(value = "databaseName", access = JsonProperty.Access.WRITE_ONLY)
+    private String databaseName;
+
+    /**
+     * Migration start time.
+     */
+    @JsonProperty(value = "startedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startedOn;
+
+    /**
+     * Migration end time.
+     */
+    @JsonProperty(value = "endedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endedOn;
+
+    /**
+     * Migration state that this database is in. Possible values include:
+     * 'UNDEFINED', 'CONFIGURING', 'INITIALIAZING', 'STARTING', 'RUNNING',
+     * 'READY_TO_COMPLETE', 'COMPLETING', 'COMPLETE', 'CANCELLING',
+     * 'CANCELLED', 'FAILED'.
+     */
+    @JsonProperty(value = "migrationState", access = JsonProperty.Access.WRITE_ONLY)
+    private SyncDatabaseMigrationReportingState migrationState;
+
+    /**
+     * Number of incoming changes.
+     */
+    @JsonProperty(value = "incomingChanges", access = JsonProperty.Access.WRITE_ONLY)
+    private Long incomingChanges;
+
+    /**
+     * Number of applied changes.
+     */
+    @JsonProperty(value = "appliedChanges", access = JsonProperty.Access.WRITE_ONLY)
+    private Long appliedChanges;
+
+    /**
+     * Number of cdc inserts.
+     */
+    @JsonProperty(value = "cdcInsertCounter", access = JsonProperty.Access.WRITE_ONLY)
+    private Long cdcInsertCounter;
+
+    /**
+     * Number of cdc deletes.
+     */
+    @JsonProperty(value = "cdcDeleteCounter", access = JsonProperty.Access.WRITE_ONLY)
+    private Long cdcDeleteCounter;
+
+    /**
+     * Number of cdc updates.
+     */
+    @JsonProperty(value = "cdcUpdateCounter", access = JsonProperty.Access.WRITE_ONLY)
+    private Long cdcUpdateCounter;
+
+    /**
+     * Number of tables completed in full load.
+     */
+    @JsonProperty(value = "fullLoadCompletedTables", access = JsonProperty.Access.WRITE_ONLY)
+    private Long fullLoadCompletedTables;
+
+    /**
+     * Number of tables loading in full load.
+     */
+    @JsonProperty(value = "fullLoadLoadingTables", access = JsonProperty.Access.WRITE_ONLY)
+    private Long fullLoadLoadingTables;
+
+    /**
+     * Number of tables queued in full load.
+     */
+    @JsonProperty(value = "fullLoadQueuedTables", access = JsonProperty.Access.WRITE_ONLY)
+    private Long fullLoadQueuedTables;
+
+    /**
+     * Number of tables errored in full load.
+     */
+    @JsonProperty(value = "fullLoadErroredTables", access = JsonProperty.Access.WRITE_ONLY)
+    private Long fullLoadErroredTables;
+
+    /**
+     * Indicates if initial load (full load) has been completed.
+     */
+    @JsonProperty(value = "initializationCompleted", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean initializationCompleted;
+
+    /**
+     * CDC apply latency.
+     */
+    @JsonProperty(value = "latency", access = JsonProperty.Access.WRITE_ONLY)
+    private Long latency;
+
+    /**
+     * Get name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Get migration start time.
+     *
+     * @return the startedOn value
+     */
+    public DateTime startedOn() {
+        return this.startedOn;
+    }
+
+    /**
+     * Get migration end time.
+     *
+     * @return the endedOn value
+     */
+    public DateTime endedOn() {
+        return this.endedOn;
+    }
+
+    /**
+     * Get migration state that this database is in. Possible values include: 'UNDEFINED', 'CONFIGURING', 'INITIALIAZING', 'STARTING', 'RUNNING', 'READY_TO_COMPLETE', 'COMPLETING', 'COMPLETE', 'CANCELLING', 'CANCELLED', 'FAILED'.
+     *
+     * @return the migrationState value
+     */
+    public SyncDatabaseMigrationReportingState migrationState() {
+        return this.migrationState;
+    }
+
+    /**
+     * Get number of incoming changes.
+     *
+     * @return the incomingChanges value
+     */
+    public Long incomingChanges() {
+        return this.incomingChanges;
+    }
+
+    /**
+     * Get number of applied changes.
+     *
+     * @return the appliedChanges value
+     */
+    public Long appliedChanges() {
+        return this.appliedChanges;
+    }
+
+    /**
+     * Get number of cdc inserts.
+     *
+     * @return the cdcInsertCounter value
+     */
+    public Long cdcInsertCounter() {
+        return this.cdcInsertCounter;
+    }
+
+    /**
+     * Get number of cdc deletes.
+     *
+     * @return the cdcDeleteCounter value
+     */
+    public Long cdcDeleteCounter() {
+        return this.cdcDeleteCounter;
+    }
+
+    /**
+     * Get number of cdc updates.
+     *
+     * @return the cdcUpdateCounter value
+     */
+    public Long cdcUpdateCounter() {
+        return this.cdcUpdateCounter;
+    }
+
+    /**
+     * Get number of tables completed in full load.
+     *
+     * @return the fullLoadCompletedTables value
+     */
+    public Long fullLoadCompletedTables() {
+        return this.fullLoadCompletedTables;
+    }
+
+    /**
+     * Get number of tables loading in full load.
+     *
+     * @return the fullLoadLoadingTables value
+     */
+    public Long fullLoadLoadingTables() {
+        return this.fullLoadLoadingTables;
+    }
+
+    /**
+     * Get number of tables queued in full load.
+     *
+     * @return the fullLoadQueuedTables value
+     */
+    public Long fullLoadQueuedTables() {
+        return this.fullLoadQueuedTables;
+    }
+
+    /**
+     * Get number of tables errored in full load.
+     *
+     * @return the fullLoadErroredTables value
+     */
+    public Long fullLoadErroredTables() {
+        return this.fullLoadErroredTables;
+    }
+
+    /**
+     * Get indicates if initial load (full load) has been completed.
+     *
+     * @return the initializationCompleted value
+     */
+    public Boolean initializationCompleted() {
+        return this.initializationCompleted;
+    }
+
+    /**
+     * Get cDC apply latency.
+     *
+     * @return the latency value
+     */
+    public Long latency() {
+        return this.latency;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputError.java
new file mode 100644
index 000000000000..5465992358b7
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputError.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateOracleAzureDbPostgreSqlSyncTaskOutputError model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateOracleAzureDbPostgreSqlSyncTaskOutputError.class)
+@JsonTypeName("ErrorOutput")
+public class MigrateOracleAzureDbPostgreSqlSyncTaskOutputError extends MigrateOracleAzureDbPostgreSqlSyncTaskOutput {
+    /**
+     * Migration error.
+     */
+    @JsonProperty(value = "error", access = JsonProperty.Access.WRITE_ONLY)
+    private ReportableException error;
+
+    /**
+     * Get migration error.
+     *
+     * @return the error value
+     */
+    public ReportableException error() {
+        return this.error;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel.java
new file mode 100644
index 000000000000..d68477fbb43c
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel.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.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel.class)
+@JsonTypeName("MigrationLevelOutput")
+public class MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel extends MigrateOracleAzureDbPostgreSqlSyncTaskOutput {
+    /**
+     * Migration start time.
+     */
+    @JsonProperty(value = "startedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startedOn;
+
+    /**
+     * Migration end time.
+     */
+    @JsonProperty(value = "endedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endedOn;
+
+    /**
+     * Source server version.
+     */
+    @JsonProperty(value = "sourceServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerVersion;
+
+    /**
+     * Source server name.
+     */
+    @JsonProperty(value = "sourceServer", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServer;
+
+    /**
+     * Target server version.
+     */
+    @JsonProperty(value = "targetServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerVersion;
+
+    /**
+     * Target server name.
+     */
+    @JsonProperty(value = "targetServer", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServer;
+
+    /**
+     * Get migration start time.
+     *
+     * @return the startedOn value
+     */
+    public DateTime startedOn() {
+        return this.startedOn;
+    }
+
+    /**
+     * Get migration end time.
+     *
+     * @return the endedOn value
+     */
+    public DateTime endedOn() {
+        return this.endedOn;
+    }
+
+    /**
+     * Get source server version.
+     *
+     * @return the sourceServerVersion value
+     */
+    public String sourceServerVersion() {
+        return this.sourceServerVersion;
+    }
+
+    /**
+     * Get source server name.
+     *
+     * @return the sourceServer value
+     */
+    public String sourceServer() {
+        return this.sourceServer;
+    }
+
+    /**
+     * Get target server version.
+     *
+     * @return the targetServerVersion value
+     */
+    public String targetServerVersion() {
+        return this.targetServerVersion;
+    }
+
+    /**
+     * Get target server name.
+     *
+     * @return the targetServer value
+     */
+    public String targetServer() {
+        return this.targetServer;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel.java
new file mode 100644
index 000000000000..c862f841e342
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel.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.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel.class)
+@JsonTypeName("TableLevelOutput")
+public class MigrateOracleAzureDbPostgreSqlSyncTaskOutputTableLevel extends MigrateOracleAzureDbPostgreSqlSyncTaskOutput {
+    /**
+     * Name of the table.
+     */
+    @JsonProperty(value = "tableName", access = JsonProperty.Access.WRITE_ONLY)
+    private String tableName;
+
+    /**
+     * Name of the database.
+     */
+    @JsonProperty(value = "databaseName", access = JsonProperty.Access.WRITE_ONLY)
+    private String databaseName;
+
+    /**
+     * Number of applied inserts.
+     */
+    @JsonProperty(value = "cdcInsertCounter", access = JsonProperty.Access.WRITE_ONLY)
+    private Long cdcInsertCounter;
+
+    /**
+     * Number of applied updates.
+     */
+    @JsonProperty(value = "cdcUpdateCounter", access = JsonProperty.Access.WRITE_ONLY)
+    private Long cdcUpdateCounter;
+
+    /**
+     * Number of applied deletes.
+     */
+    @JsonProperty(value = "cdcDeleteCounter", access = JsonProperty.Access.WRITE_ONLY)
+    private Long cdcDeleteCounter;
+
+    /**
+     * Estimate to finish full load.
+     */
+    @JsonProperty(value = "fullLoadEstFinishTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime fullLoadEstFinishTime;
+
+    /**
+     * Full load start time.
+     */
+    @JsonProperty(value = "fullLoadStartedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime fullLoadStartedOn;
+
+    /**
+     * Full load end time.
+     */
+    @JsonProperty(value = "fullLoadEndedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime fullLoadEndedOn;
+
+    /**
+     * Number of rows applied in full load.
+     */
+    @JsonProperty(value = "fullLoadTotalRows", access = JsonProperty.Access.WRITE_ONLY)
+    private Long fullLoadTotalRows;
+
+    /**
+     * Current state of the table migration. Possible values include:
+     * 'BEFORE_LOAD', 'FULL_LOAD', 'COMPLETED', 'CANCELED', 'ERROR', 'FAILED'.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private SyncTableMigrationState state;
+
+    /**
+     * Total number of applied changes.
+     */
+    @JsonProperty(value = "totalChangesApplied", access = JsonProperty.Access.WRITE_ONLY)
+    private Long totalChangesApplied;
+
+    /**
+     * Number of data errors occurred.
+     */
+    @JsonProperty(value = "dataErrorsCounter", access = JsonProperty.Access.WRITE_ONLY)
+    private Long dataErrorsCounter;
+
+    /**
+     * Last modified time on target.
+     */
+    @JsonProperty(value = "lastModifiedTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime lastModifiedTime;
+
+    /**
+     * Get name of the table.
+     *
+     * @return the tableName value
+     */
+    public String tableName() {
+        return this.tableName;
+    }
+
+    /**
+     * Get name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Get number of applied inserts.
+     *
+     * @return the cdcInsertCounter value
+     */
+    public Long cdcInsertCounter() {
+        return this.cdcInsertCounter;
+    }
+
+    /**
+     * Get number of applied updates.
+     *
+     * @return the cdcUpdateCounter value
+     */
+    public Long cdcUpdateCounter() {
+        return this.cdcUpdateCounter;
+    }
+
+    /**
+     * Get number of applied deletes.
+     *
+     * @return the cdcDeleteCounter value
+     */
+    public Long cdcDeleteCounter() {
+        return this.cdcDeleteCounter;
+    }
+
+    /**
+     * Get estimate to finish full load.
+     *
+     * @return the fullLoadEstFinishTime value
+     */
+    public DateTime fullLoadEstFinishTime() {
+        return this.fullLoadEstFinishTime;
+    }
+
+    /**
+     * Get full load start time.
+     *
+     * @return the fullLoadStartedOn value
+     */
+    public DateTime fullLoadStartedOn() {
+        return this.fullLoadStartedOn;
+    }
+
+    /**
+     * Get full load end time.
+     *
+     * @return the fullLoadEndedOn value
+     */
+    public DateTime fullLoadEndedOn() {
+        return this.fullLoadEndedOn;
+    }
+
+    /**
+     * Get number of rows applied in full load.
+     *
+     * @return the fullLoadTotalRows value
+     */
+    public Long fullLoadTotalRows() {
+        return this.fullLoadTotalRows;
+    }
+
+    /**
+     * Get current state of the table migration. Possible values include: 'BEFORE_LOAD', 'FULL_LOAD', 'COMPLETED', 'CANCELED', 'ERROR', 'FAILED'.
+     *
+     * @return the state value
+     */
+    public SyncTableMigrationState state() {
+        return this.state;
+    }
+
+    /**
+     * Get total number of applied changes.
+     *
+     * @return the totalChangesApplied value
+     */
+    public Long totalChangesApplied() {
+        return this.totalChangesApplied;
+    }
+
+    /**
+     * Get number of data errors occurred.
+     *
+     * @return the dataErrorsCounter value
+     */
+    public Long dataErrorsCounter() {
+        return this.dataErrorsCounter;
+    }
+
+    /**
+     * Get last modified time on target.
+     *
+     * @return the lastModifiedTime value
+     */
+    public DateTime lastModifiedTime() {
+        return this.lastModifiedTime;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput.java
index 6a94a76c5c05..e827d7f09eb0 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
 
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -28,6 +29,24 @@ public class MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput {
     @JsonProperty(value = "targetDatabaseName")
     private String targetDatabaseName;
 
+    /**
+     * Migration settings which tune the migration behavior.
+     */
+    @JsonProperty(value = "migrationSetting")
+    private Map<String, String> migrationSetting;
+
+    /**
+     * Source settings to tune source endpoint migration behavior.
+     */
+    @JsonProperty(value = "sourceSetting")
+    private Map<String, String> sourceSetting;
+
+    /**
+     * Target settings to tune target endpoint migration behavior.
+     */
+    @JsonProperty(value = "targetSetting")
+    private Map<String, String> targetSetting;
+
     /**
      * Get name of the database.
      *
@@ -68,4 +87,64 @@ public MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput withTargetDatabase
         return this;
     }
 
+    /**
+     * Get migration settings which tune the migration behavior.
+     *
+     * @return the migrationSetting value
+     */
+    public Map<String, String> migrationSetting() {
+        return this.migrationSetting;
+    }
+
+    /**
+     * Set migration settings which tune the migration behavior.
+     *
+     * @param migrationSetting the migrationSetting value to set
+     * @return the MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput withMigrationSetting(Map<String, String> migrationSetting) {
+        this.migrationSetting = migrationSetting;
+        return this;
+    }
+
+    /**
+     * Get source settings to tune source endpoint migration behavior.
+     *
+     * @return the sourceSetting value
+     */
+    public Map<String, String> sourceSetting() {
+        return this.sourceSetting;
+    }
+
+    /**
+     * Set source settings to tune source endpoint migration behavior.
+     *
+     * @param sourceSetting the sourceSetting value to set
+     * @return the MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput withSourceSetting(Map<String, String> sourceSetting) {
+        this.sourceSetting = sourceSetting;
+        return this;
+    }
+
+    /**
+     * Get target settings to tune target endpoint migration behavior.
+     *
+     * @return the targetSetting value
+     */
+    public Map<String, String> targetSetting() {
+        return this.targetSetting;
+    }
+
+    /**
+     * Set target settings to tune target endpoint migration behavior.
+     *
+     * @param targetSetting the targetSetting value to set
+     * @return the MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput object itself.
+     */
+    public MigratePostgreSqlAzureDbForPostgreSqlSyncDatabaseInput withTargetSetting(Map<String, String> targetSetting) {
+        this.targetSetting = targetSetting;
+        return this;
+    }
+
 }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput.java
index b2caf288b8bd..84715f9f89f8 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that migrates PostgreSQL databases to Azure Database for
  * PostgreSQL for online migrations.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput.class)
 @JsonTypeName("MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "DatabaseLevelErrorOutput", value = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError.class),
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError.java
index fde8231b698d..26ec9b044bf3 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError.java
@@ -16,7 +16,7 @@
 /**
  * The MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError.class)
 @JsonTypeName("DatabaseLevelErrorOutput")
 public class MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseError extends MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseLevel.java
index a759838cb565..44467bca1be3 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputDatabaseLevel extends MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputError.java
index 599359a2a16b..1884024a209e 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * The MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputError.class)
 @JsonTypeName("ErrorOutput")
 public class MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputError extends MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel.java
index 98b491f20e27..034fd6b91f0f 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel.class)
 @JsonTypeName("MigrationLevelOutput")
 public class MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel extends MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputTableLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputTableLevel.java
index b6110c68117c..9755fe4ab717 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputTableLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputTableLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputTableLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputTableLevel.class)
 @JsonTypeName("TableLevelOutput")
 public class MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputTableLevel extends MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.java
index 7dc6e5a45e71..6ab70240201f 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that migrates PostgreSQL databases to Azure Database
  * for PostgreSQL for online migrations.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.class)
 @JsonTypeName("Migrate.PostgreSql.AzureDbForPostgreSql.Sync")
 public class MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutput.java
index 459900dadd05..c4d5d10fc6ac 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that migrates Schema for SQL Server databases to Azure
  * SQL databases.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSchemaSqlServerSqlDbTaskOutput.class)
 @JsonTypeName("MigrateSchemaSqlServerSqlDbTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "MigrationLevelOutput", value = MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel.class),
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputDatabaseLevel.java
index 35925e75b8e4..59bd26ec0a1f 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputDatabaseLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputDatabaseLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateSchemaSqlServerSqlDbTaskOutputDatabaseLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSchemaSqlServerSqlDbTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class MigrateSchemaSqlServerSqlDbTaskOutputDatabaseLevel extends MigrateSchemaSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputError.java
index 3a9a777ec600..fe927a0aae77 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * The MigrateSchemaSqlServerSqlDbTaskOutputError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSchemaSqlServerSqlDbTaskOutputError.class)
 @JsonTypeName("SchemaErrorOutput")
 public class MigrateSchemaSqlServerSqlDbTaskOutputError extends MigrateSchemaSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel.java
index 7700414a53eb..d5f547f9f36c 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel.class)
 @JsonTypeName("MigrationLevelOutput")
 public class MigrateSchemaSqlServerSqlDbTaskOutputMigrationLevel extends MigrateSchemaSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskProperties.java
index 7b23c0e96a5f..ffb3f23d7701 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlServerSqlDbTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for task that migrates Schema for SQL Server databases to Azure
  * SQL databases.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSchemaSqlServerSqlDbTaskProperties.class)
 @JsonTypeName("MigrateSchemaSqlServerSqlDb")
 public class MigrateSchemaSqlServerSqlDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlTaskOutputError.java
index c70710d8f878..6b5d66a50884 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlTaskOutputError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSchemaSqlTaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * The MigrateSchemaSqlTaskOutputError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSchemaSqlTaskOutputError.class)
 @JsonTypeName("ErrorOutput")
 public class MigrateSchemaSqlTaskOutputError extends MigrateSchemaSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutput.java
index 0540eb2da927..7d4d6a44da61 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that migrates on-prem SQL Server databases to Azure SQL
  * Database for online migrations.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbSyncTaskOutput.class)
 @JsonTypeName("MigrateSqlServerSqlDbSyncTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "DatabaseLevelErrorOutput", value = MigrateSqlServerSqlDbSyncTaskOutputDatabaseError.class),
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseError.java
index 6f2263e3677f..0e51b1f9084c 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseError.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateSqlServerSqlDbSyncTaskOutputDatabaseError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbSyncTaskOutputDatabaseError.class)
 @JsonTypeName("DatabaseLevelErrorOutput")
 public class MigrateSqlServerSqlDbSyncTaskOutputDatabaseError extends MigrateSqlServerSqlDbSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseLevel.java
index 72d0467ed9e5..dd3c3f3f087a 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputDatabaseLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateSqlServerSqlDbSyncTaskOutputDatabaseLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbSyncTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class MigrateSqlServerSqlDbSyncTaskOutputDatabaseLevel extends MigrateSqlServerSqlDbSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputError.java
index 69873a8038fb..d993c717eacb 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * The MigrateSqlServerSqlDbSyncTaskOutputError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbSyncTaskOutputError.class)
 @JsonTypeName("ErrorOutput")
 public class MigrateSqlServerSqlDbSyncTaskOutputError extends MigrateSqlServerSqlDbSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel.java
index d3c2489ed59b..9bc1cbb87afb 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel.class)
 @JsonTypeName("MigrationLevelOutput")
 public class MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel extends MigrateSqlServerSqlDbSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputTableLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputTableLevel.java
index 216322c39b9c..1532d40afaf8 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputTableLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskOutputTableLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateSqlServerSqlDbSyncTaskOutputTableLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbSyncTaskOutputTableLevel.class)
 @JsonTypeName("TableLevelOutput")
 public class MigrateSqlServerSqlDbSyncTaskOutputTableLevel extends MigrateSqlServerSqlDbSyncTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskProperties.java
index 2e1b90f09cf8..b2966e47e6dc 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbSyncTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that migrates on-prem SQL Server databases to Azure
  * SQL Database for online migrations.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSqlServerSqlDbSyncTaskProperties.class)
 @JsonTypeName("Migrate.SqlServer.AzureSqlDb.Sync")
 public class MigrateSqlServerSqlDbSyncTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutput.java
index 6f41e1d6530c..5d5b6deab73f 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutput.java
@@ -17,7 +17,7 @@
  * Output for the task that migrates on-prem SQL Server databases to Azure SQL
  * Database.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutput.class)
 @JsonTypeName("MigrateSqlServerSqlDbTaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "ErrorOutput", value = MigrateSqlServerSqlDbTaskOutputError.class),
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java
index 37cf51a7a2fd..879ffc6692c9 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java
@@ -18,7 +18,7 @@
 /**
  * The MigrateSqlServerSqlDbTaskOutputDatabaseLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class MigrateSqlServerSqlDbTaskOutputDatabaseLevel extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputError.java
index 3266b090a366..acd9bd8cd695 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * The MigrateSqlServerSqlDbTaskOutputError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputError.class)
 @JsonTypeName("ErrorOutput")
 public class MigrateSqlServerSqlDbTaskOutputError extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java
index a4051b9b9485..ed4d1924ccd0 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java
@@ -18,7 +18,7 @@
 /**
  * The MigrateSqlServerSqlDbTaskOutputMigrationLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputMigrationLevel.class)
 @JsonTypeName("MigrationLevelOutput")
 public class MigrateSqlServerSqlDbTaskOutputMigrationLevel extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java
index 357c527dacb0..dce11ea0f477 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java
@@ -16,7 +16,7 @@
 /**
  * The MigrateSqlServerSqlDbTaskOutputTableLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputTableLevel.class)
 @JsonTypeName("TableLevelOutput")
 public class MigrateSqlServerSqlDbTaskOutputTableLevel extends MigrateSqlServerSqlDbTaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskProperties.java
index 3a13b549153c..bff3b16bcb96 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlDbTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that migrates on-prem SQL Server databases to Azure
  * SQL Database.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSqlServerSqlDbTaskProperties.class)
 @JsonTypeName("Migrate.SqlServer.SqlDb")
 public class MigrateSqlServerSqlDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskInput.java
new file mode 100644
index 000000000000..e7f371f75f80
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+
+/**
+ * Input for task that migrates SQL Server databases to Azure SQL Database
+ * Managed Instance online scenario.
+ */
+public class MigrateSqlServerSqlMISyncTaskInput extends SqlServerSqlMISyncTaskInput {
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutput.java
new file mode 100644
index 000000000000..b17e835650ce
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * Output for task that migrates SQL Server databases to Azure SQL Database
+ * Managed Instance using Log Replay Service.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMISyncTaskOutput.class)
+@JsonTypeName("MigrateSqlServerSqlMISyncTaskOutput")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "ErrorOutput", value = MigrateSqlServerSqlMISyncTaskOutputError.class),
+    @JsonSubTypes.Type(name = "DatabaseLevelOutput", value = MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel.class),
+    @JsonSubTypes.Type(name = "MigrationLevelOutput", value = MigrateSqlServerSqlMISyncTaskOutputMigrationLevel.class)
+})
+public class MigrateSqlServerSqlMISyncTaskOutput {
+    /**
+     * Result identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Get result identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel.java
new file mode 100644
index 000000000000..523eb08dd3b8
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel.java
@@ -0,0 +1,193 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel.class)
+@JsonTypeName("DatabaseLevelOutput")
+public class MigrateSqlServerSqlMISyncTaskOutputDatabaseLevel extends MigrateSqlServerSqlMISyncTaskOutput {
+    /**
+     * Name of the database.
+     */
+    @JsonProperty(value = "sourceDatabaseName", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceDatabaseName;
+
+    /**
+     * Current state of database. Possible values include: 'UNDEFINED',
+     * 'INITIAL', 'FULL_BACKUP_UPLOAD_START', 'LOG_SHIPPING_START',
+     * 'UPLOAD_LOG_FILES_START', 'CUTOVER_START', 'POST_CUTOVER_COMPLETE',
+     * 'COMPLETED', 'CANCELLED', 'FAILED'.
+     */
+    @JsonProperty(value = "migrationState", access = JsonProperty.Access.WRITE_ONLY)
+    private DatabaseMigrationState migrationState;
+
+    /**
+     * Database migration start time.
+     */
+    @JsonProperty(value = "startedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startedOn;
+
+    /**
+     * Database migration end time.
+     */
+    @JsonProperty(value = "endedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endedOn;
+
+    /**
+     * Details of full backup set.
+     */
+    @JsonProperty(value = "fullBackupSetInfo", access = JsonProperty.Access.WRITE_ONLY)
+    private BackupSetInfo fullBackupSetInfo;
+
+    /**
+     * Last applied backup set information.
+     */
+    @JsonProperty(value = "lastRestoredBackupSetInfo", access = JsonProperty.Access.WRITE_ONLY)
+    private BackupSetInfo lastRestoredBackupSetInfo;
+
+    /**
+     * Backup sets that are currently active (Either being uploaded or getting
+     * restored).
+     */
+    @JsonProperty(value = "activeBackupSets", access = JsonProperty.Access.WRITE_ONLY)
+    private List<BackupSetInfo> activeBackupSets;
+
+    /**
+     * Name of container created in the Azure Storage account where backups are
+     * copied to.
+     */
+    @JsonProperty(value = "containerName", access = JsonProperty.Access.WRITE_ONLY)
+    private String containerName;
+
+    /**
+     * prefix string to use for querying errors for this database.
+     */
+    @JsonProperty(value = "errorPrefix", access = JsonProperty.Access.WRITE_ONLY)
+    private String errorPrefix;
+
+    /**
+     * Whether full backup has been applied to the target database or not.
+     */
+    @JsonProperty(value = "isFullBackupRestored", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean isFullBackupRestored;
+
+    /**
+     * Migration exceptions and warnings.
+     */
+    @JsonProperty(value = "exceptionsAndWarnings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> exceptionsAndWarnings;
+
+    /**
+     * Get name of the database.
+     *
+     * @return the sourceDatabaseName value
+     */
+    public String sourceDatabaseName() {
+        return this.sourceDatabaseName;
+    }
+
+    /**
+     * Get current state of database. Possible values include: 'UNDEFINED', 'INITIAL', 'FULL_BACKUP_UPLOAD_START', 'LOG_SHIPPING_START', 'UPLOAD_LOG_FILES_START', 'CUTOVER_START', 'POST_CUTOVER_COMPLETE', 'COMPLETED', 'CANCELLED', 'FAILED'.
+     *
+     * @return the migrationState value
+     */
+    public DatabaseMigrationState migrationState() {
+        return this.migrationState;
+    }
+
+    /**
+     * Get database migration start time.
+     *
+     * @return the startedOn value
+     */
+    public DateTime startedOn() {
+        return this.startedOn;
+    }
+
+    /**
+     * Get database migration end time.
+     *
+     * @return the endedOn value
+     */
+    public DateTime endedOn() {
+        return this.endedOn;
+    }
+
+    /**
+     * Get details of full backup set.
+     *
+     * @return the fullBackupSetInfo value
+     */
+    public BackupSetInfo fullBackupSetInfo() {
+        return this.fullBackupSetInfo;
+    }
+
+    /**
+     * Get last applied backup set information.
+     *
+     * @return the lastRestoredBackupSetInfo value
+     */
+    public BackupSetInfo lastRestoredBackupSetInfo() {
+        return this.lastRestoredBackupSetInfo;
+    }
+
+    /**
+     * Get backup sets that are currently active (Either being uploaded or getting restored).
+     *
+     * @return the activeBackupSets value
+     */
+    public List<BackupSetInfo> activeBackupSets() {
+        return this.activeBackupSets;
+    }
+
+    /**
+     * Get name of container created in the Azure Storage account where backups are copied to.
+     *
+     * @return the containerName value
+     */
+    public String containerName() {
+        return this.containerName;
+    }
+
+    /**
+     * Get prefix string to use for querying errors for this database.
+     *
+     * @return the errorPrefix value
+     */
+    public String errorPrefix() {
+        return this.errorPrefix;
+    }
+
+    /**
+     * Get whether full backup has been applied to the target database or not.
+     *
+     * @return the isFullBackupRestored value
+     */
+    public Boolean isFullBackupRestored() {
+        return this.isFullBackupRestored;
+    }
+
+    /**
+     * Get migration exceptions and warnings.
+     *
+     * @return the exceptionsAndWarnings value
+     */
+    public List<ReportableException> exceptionsAndWarnings() {
+        return this.exceptionsAndWarnings;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputError.java
new file mode 100644
index 000000000000..7fa0947997aa
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputError.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateSqlServerSqlMISyncTaskOutputError model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMISyncTaskOutputError.class)
+@JsonTypeName("ErrorOutput")
+public class MigrateSqlServerSqlMISyncTaskOutputError extends MigrateSqlServerSqlMISyncTaskOutput {
+    /**
+     * Migration error.
+     */
+    @JsonProperty(value = "error", access = JsonProperty.Access.WRITE_ONLY)
+    private ReportableException error;
+
+    /**
+     * Get migration error.
+     *
+     * @return the error value
+     */
+    public ReportableException error() {
+        return this.error;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputMigrationLevel.java
new file mode 100644
index 000000000000..4da76ed9e0b2
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskOutputMigrationLevel.java
@@ -0,0 +1,188 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateSqlServerSqlMISyncTaskOutputMigrationLevel model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMISyncTaskOutputMigrationLevel.class)
+@JsonTypeName("MigrationLevelOutput")
+public class MigrateSqlServerSqlMISyncTaskOutputMigrationLevel extends MigrateSqlServerSqlMISyncTaskOutput {
+    /**
+     * Count of databases.
+     */
+    @JsonProperty(value = "databaseCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer databaseCount;
+
+    /**
+     * Current state of migration. Possible values include: 'None',
+     * 'InProgress', 'Failed', 'Warning', 'Completed', 'Skipped', 'Stopped'.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private MigrationState state;
+
+    /**
+     * Migration start time.
+     */
+    @JsonProperty(value = "startedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startedOn;
+
+    /**
+     * Migration end time.
+     */
+    @JsonProperty(value = "endedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endedOn;
+
+    /**
+     * Source server name.
+     */
+    @JsonProperty(value = "sourceServerName", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerName;
+
+    /**
+     * Source server version.
+     */
+    @JsonProperty(value = "sourceServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerVersion;
+
+    /**
+     * Source server brand version.
+     */
+    @JsonProperty(value = "sourceServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerBrandVersion;
+
+    /**
+     * Target server name.
+     */
+    @JsonProperty(value = "targetServerName", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerName;
+
+    /**
+     * Target server version.
+     */
+    @JsonProperty(value = "targetServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerVersion;
+
+    /**
+     * Target server brand version.
+     */
+    @JsonProperty(value = "targetServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerBrandVersion;
+
+    /**
+     * Number of database level errors.
+     */
+    @JsonProperty(value = "databaseErrorCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer databaseErrorCount;
+
+    /**
+     * Get count of databases.
+     *
+     * @return the databaseCount value
+     */
+    public Integer databaseCount() {
+        return this.databaseCount;
+    }
+
+    /**
+     * Get current state of migration. Possible values include: 'None', 'InProgress', 'Failed', 'Warning', 'Completed', 'Skipped', 'Stopped'.
+     *
+     * @return the state value
+     */
+    public MigrationState state() {
+        return this.state;
+    }
+
+    /**
+     * Get migration start time.
+     *
+     * @return the startedOn value
+     */
+    public DateTime startedOn() {
+        return this.startedOn;
+    }
+
+    /**
+     * Get migration end time.
+     *
+     * @return the endedOn value
+     */
+    public DateTime endedOn() {
+        return this.endedOn;
+    }
+
+    /**
+     * Get source server name.
+     *
+     * @return the sourceServerName value
+     */
+    public String sourceServerName() {
+        return this.sourceServerName;
+    }
+
+    /**
+     * Get source server version.
+     *
+     * @return the sourceServerVersion value
+     */
+    public String sourceServerVersion() {
+        return this.sourceServerVersion;
+    }
+
+    /**
+     * Get source server brand version.
+     *
+     * @return the sourceServerBrandVersion value
+     */
+    public String sourceServerBrandVersion() {
+        return this.sourceServerBrandVersion;
+    }
+
+    /**
+     * Get target server name.
+     *
+     * @return the targetServerName value
+     */
+    public String targetServerName() {
+        return this.targetServerName;
+    }
+
+    /**
+     * Get target server version.
+     *
+     * @return the targetServerVersion value
+     */
+    public String targetServerVersion() {
+        return this.targetServerVersion;
+    }
+
+    /**
+     * Get target server brand version.
+     *
+     * @return the targetServerBrandVersion value
+     */
+    public String targetServerBrandVersion() {
+        return this.targetServerBrandVersion;
+    }
+
+    /**
+     * Get number of database level errors.
+     *
+     * @return the databaseErrorCount value
+     */
+    public Integer databaseErrorCount() {
+        return this.databaseErrorCount;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskProperties.java
new file mode 100644
index 000000000000..57e3596835a7
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMISyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for task that migrates SQL Server databases to Azure SQL Database
+ * Managed Instance sync scenario.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSqlServerSqlMISyncTaskProperties.class)
+@JsonTypeName("Migrate.SqlServer.AzureSqlDbMI.Sync.LRS")
+public class MigrateSqlServerSqlMISyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private MigrateSqlServerSqlMISyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<MigrateSqlServerSqlMISyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public MigrateSqlServerSqlMISyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the MigrateSqlServerSqlMISyncTaskProperties object itself.
+     */
+    public MigrateSqlServerSqlMISyncTaskProperties withInput(MigrateSqlServerSqlMISyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<MigrateSqlServerSqlMISyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutput.java
index 17cabcea6140..0c91b24ef7ab 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutput.java
@@ -17,7 +17,7 @@
  * Output for task that migrates SQL Server databases to Azure SQL Database
  * Managed Instance.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutput.class)
 @JsonTypeName("MigrateSqlServerSqlMITaskOutput")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "ErrorOutput", value = MigrateSqlServerSqlMITaskOutputError.class),
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java
index aa303584f674..2f7a37f1d71c 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java
@@ -17,7 +17,7 @@
 /**
  * The MigrateSqlServerSqlMITaskOutputAgentJobLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputAgentJobLevel.class)
 @JsonTypeName("AgentJobLevelOutput")
 public class MigrateSqlServerSqlMITaskOutputAgentJobLevel extends MigrateSqlServerSqlMITaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java
index 02bff80a6848..db2188ff62e1 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java
@@ -17,7 +17,7 @@
 /**
  * The MigrateSqlServerSqlMITaskOutputDatabaseLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputDatabaseLevel.class)
 @JsonTypeName("DatabaseLevelOutput")
 public class MigrateSqlServerSqlMITaskOutputDatabaseLevel extends MigrateSqlServerSqlMITaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputError.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputError.java
index 7277a2e49d7a..fb6df32dcf2d 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputError.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputError.java
@@ -15,7 +15,7 @@
 /**
  * The MigrateSqlServerSqlMITaskOutputError model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputError.class)
 @JsonTypeName("ErrorOutput")
 public class MigrateSqlServerSqlMITaskOutputError extends MigrateSqlServerSqlMITaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java
index 71154cab8c11..496c6e11d8c4 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java
@@ -17,7 +17,7 @@
 /**
  * The MigrateSqlServerSqlMITaskOutputLoginLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputLoginLevel.class)
 @JsonTypeName("LoginLevelOutput")
 public class MigrateSqlServerSqlMITaskOutputLoginLevel extends MigrateSqlServerSqlMITaskOutput {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java
index 8986b440acd1..008fc3150ce7 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java
@@ -18,7 +18,7 @@
 /**
  * The MigrateSqlServerSqlMITaskOutputMigrationLevel model.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputMigrationLevel.class)
 @JsonTypeName("MigrationLevelOutput")
 public class MigrateSqlServerSqlMITaskOutputMigrationLevel extends MigrateSqlServerSqlMITaskOutput {
     /**
@@ -73,10 +73,10 @@ public class MigrateSqlServerSqlMITaskOutputMigrationLevel extends MigrateSqlSer
     private Map<String, StartMigrationScenarioServerRoleResult> serverRoleResults;
 
     /**
-     * Map of users to database name of orphaned users.
+     * List of orphaned users.
      */
-    @JsonProperty(value = "orphanedUsers", access = JsonProperty.Access.WRITE_ONLY)
-    private Map<String, String> orphanedUsers;
+    @JsonProperty(value = "orphanedUsersInfo", access = JsonProperty.Access.WRITE_ONLY)
+    private List<OrphanedUserInfo> orphanedUsersInfo;
 
     /**
      * Selected databases as a map from database name to database id.
@@ -187,12 +187,12 @@ public Map<String, StartMigrationScenarioServerRoleResult> serverRoleResults() {
     }
 
     /**
-     * Get map of users to database name of orphaned users.
+     * Get list of orphaned users.
      *
-     * @return the orphanedUsers value
+     * @return the orphanedUsersInfo value
      */
-    public Map<String, String> orphanedUsers() {
-        return this.orphanedUsers;
+    public List<OrphanedUserInfo> orphanedUsersInfo() {
+        return this.orphanedUsersInfo;
     }
 
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskProperties.java
index 094797a6c57c..9631cfd12f85 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSqlServerSqlMITaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for task that migrates SQL Server databases to Azure SQL Database
  * Managed Instance.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSqlServerSqlMITaskProperties.class)
 @JsonTypeName("Migrate.SqlServer.AzureSqlDbMI")
 public class MigrateSqlServerSqlMITaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskInput.java
new file mode 100644
index 000000000000..1452b178145a
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for task that migrates SSIS packages from SQL Server to Azure SQL
+ * Database Managed Instance.
+ */
+public class MigrateSsisTaskInput extends SqlMigrationTaskInput {
+    /**
+     * SSIS package migration information.
+     */
+    @JsonProperty(value = "ssisMigrationInfo", required = true)
+    private SsisMigrationInfo ssisMigrationInfo;
+
+    /**
+     * Get sSIS package migration information.
+     *
+     * @return the ssisMigrationInfo value
+     */
+    public SsisMigrationInfo ssisMigrationInfo() {
+        return this.ssisMigrationInfo;
+    }
+
+    /**
+     * Set sSIS package migration information.
+     *
+     * @param ssisMigrationInfo the ssisMigrationInfo value to set
+     * @return the MigrateSsisTaskInput object itself.
+     */
+    public MigrateSsisTaskInput withSsisMigrationInfo(SsisMigrationInfo ssisMigrationInfo) {
+        this.ssisMigrationInfo = ssisMigrationInfo;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutput.java
new file mode 100644
index 000000000000..0cb303340fbd
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * Output for task that migrates SSIS packages from SQL Server to Azure SQL
+ * Database Managed Instance.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSsisTaskOutput.class)
+@JsonTypeName("MigrateSsisTaskOutput")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "SsisProjectLevelOutput", value = MigrateSsisTaskOutputProjectLevel.class),
+    @JsonSubTypes.Type(name = "MigrationLevelOutput", value = MigrateSsisTaskOutputMigrationLevel.class)
+})
+public class MigrateSsisTaskOutput {
+    /**
+     * Result identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Get result identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputMigrationLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputMigrationLevel.java
new file mode 100644
index 000000000000..c24425c84374
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputMigrationLevel.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.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateSsisTaskOutputMigrationLevel model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSsisTaskOutputMigrationLevel.class)
+@JsonTypeName("MigrationLevelOutput")
+public class MigrateSsisTaskOutputMigrationLevel extends MigrateSsisTaskOutput {
+    /**
+     * Migration start time.
+     */
+    @JsonProperty(value = "startedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startedOn;
+
+    /**
+     * Migration end time.
+     */
+    @JsonProperty(value = "endedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endedOn;
+
+    /**
+     * Current status of migration. Possible values include: 'Default',
+     * 'Connecting', 'SourceAndTargetSelected', 'SelectLogins', 'Configured',
+     * 'Running', 'Error', 'Stopped', 'Completed', 'CompletedWithWarnings'.
+     */
+    @JsonProperty(value = "status", access = JsonProperty.Access.WRITE_ONLY)
+    private MigrationStatus status;
+
+    /**
+     * Migration progress message.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Source server version.
+     */
+    @JsonProperty(value = "sourceServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerVersion;
+
+    /**
+     * Source server brand version.
+     */
+    @JsonProperty(value = "sourceServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String sourceServerBrandVersion;
+
+    /**
+     * Target server version.
+     */
+    @JsonProperty(value = "targetServerVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerVersion;
+
+    /**
+     * Target server brand version.
+     */
+    @JsonProperty(value = "targetServerBrandVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String targetServerBrandVersion;
+
+    /**
+     * Migration exceptions and warnings.
+     */
+    @JsonProperty(value = "exceptionsAndWarnings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> exceptionsAndWarnings;
+
+    /**
+     * Stage of SSIS migration. Possible values include: 'None', 'Initialize',
+     * 'InProgress', 'Completed'.
+     */
+    @JsonProperty(value = "stage", access = JsonProperty.Access.WRITE_ONLY)
+    private SsisMigrationStage stage;
+
+    /**
+     * Get migration start time.
+     *
+     * @return the startedOn value
+     */
+    public DateTime startedOn() {
+        return this.startedOn;
+    }
+
+    /**
+     * Get migration end time.
+     *
+     * @return the endedOn value
+     */
+    public DateTime endedOn() {
+        return this.endedOn;
+    }
+
+    /**
+     * Get current status of migration. Possible values include: 'Default', 'Connecting', 'SourceAndTargetSelected', 'SelectLogins', 'Configured', 'Running', 'Error', 'Stopped', 'Completed', 'CompletedWithWarnings'.
+     *
+     * @return the status value
+     */
+    public MigrationStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Get migration progress message.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get source server version.
+     *
+     * @return the sourceServerVersion value
+     */
+    public String sourceServerVersion() {
+        return this.sourceServerVersion;
+    }
+
+    /**
+     * Get source server brand version.
+     *
+     * @return the sourceServerBrandVersion value
+     */
+    public String sourceServerBrandVersion() {
+        return this.sourceServerBrandVersion;
+    }
+
+    /**
+     * Get target server version.
+     *
+     * @return the targetServerVersion value
+     */
+    public String targetServerVersion() {
+        return this.targetServerVersion;
+    }
+
+    /**
+     * Get target server brand version.
+     *
+     * @return the targetServerBrandVersion value
+     */
+    public String targetServerBrandVersion() {
+        return this.targetServerBrandVersion;
+    }
+
+    /**
+     * Get migration exceptions and warnings.
+     *
+     * @return the exceptionsAndWarnings value
+     */
+    public List<ReportableException> exceptionsAndWarnings() {
+        return this.exceptionsAndWarnings;
+    }
+
+    /**
+     * Get stage of SSIS migration. Possible values include: 'None', 'Initialize', 'InProgress', 'Completed'.
+     *
+     * @return the stage value
+     */
+    public SsisMigrationStage stage() {
+        return this.stage;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputProjectLevel.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputProjectLevel.java
new file mode 100644
index 000000000000..d43c19c35b37
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskOutputProjectLevel.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.datamigration.v2018_07_15_preview;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The MigrateSsisTaskOutputProjectLevel model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSsisTaskOutputProjectLevel.class)
+@JsonTypeName("SsisProjectLevelOutput")
+public class MigrateSsisTaskOutputProjectLevel extends MigrateSsisTaskOutput {
+    /**
+     * Name of the folder.
+     */
+    @JsonProperty(value = "folderName", access = JsonProperty.Access.WRITE_ONLY)
+    private String folderName;
+
+    /**
+     * Name of the project.
+     */
+    @JsonProperty(value = "projectName", access = JsonProperty.Access.WRITE_ONLY)
+    private String projectName;
+
+    /**
+     * Current state of migration. Possible values include: 'None',
+     * 'InProgress', 'Failed', 'Warning', 'Completed', 'Skipped', 'Stopped'.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private MigrationState state;
+
+    /**
+     * Stage of SSIS migration. Possible values include: 'None', 'Initialize',
+     * 'InProgress', 'Completed'.
+     */
+    @JsonProperty(value = "stage", access = JsonProperty.Access.WRITE_ONLY)
+    private SsisMigrationStage stage;
+
+    /**
+     * Migration start time.
+     */
+    @JsonProperty(value = "startedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startedOn;
+
+    /**
+     * Migration end time.
+     */
+    @JsonProperty(value = "endedOn", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endedOn;
+
+    /**
+     * Migration progress message.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Migration exceptions and warnings.
+     */
+    @JsonProperty(value = "exceptionsAndWarnings", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> exceptionsAndWarnings;
+
+    /**
+     * Get name of the folder.
+     *
+     * @return the folderName value
+     */
+    public String folderName() {
+        return this.folderName;
+    }
+
+    /**
+     * Get name of the project.
+     *
+     * @return the projectName value
+     */
+    public String projectName() {
+        return this.projectName;
+    }
+
+    /**
+     * Get current state of migration. Possible values include: 'None', 'InProgress', 'Failed', 'Warning', 'Completed', 'Skipped', 'Stopped'.
+     *
+     * @return the state value
+     */
+    public MigrationState state() {
+        return this.state;
+    }
+
+    /**
+     * Get stage of SSIS migration. Possible values include: 'None', 'Initialize', 'InProgress', 'Completed'.
+     *
+     * @return the stage value
+     */
+    public SsisMigrationStage stage() {
+        return this.stage;
+    }
+
+    /**
+     * Get migration start time.
+     *
+     * @return the startedOn value
+     */
+    public DateTime startedOn() {
+        return this.startedOn;
+    }
+
+    /**
+     * Get migration end time.
+     *
+     * @return the endedOn value
+     */
+    public DateTime endedOn() {
+        return this.endedOn;
+    }
+
+    /**
+     * Get migration progress message.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get migration exceptions and warnings.
+     *
+     * @return the exceptionsAndWarnings value
+     */
+    public List<ReportableException> exceptionsAndWarnings() {
+        return this.exceptionsAndWarnings;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskProperties.java
new file mode 100644
index 000000000000..eed248aef840
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSsisTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for task that migrates SSIS packages from SQL Server databases to
+ * Azure SQL Database Managed Instance.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSsisTaskProperties.class)
+@JsonTypeName("Migrate.Ssis")
+public class MigrateSsisTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private MigrateSsisTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<MigrateSsisTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public MigrateSsisTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the MigrateSsisTaskProperties object itself.
+     */
+    public MigrateSsisTaskProperties withInput(MigrateSsisTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<MigrateSsisTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandOutput.java
index 0dfbf528803b..6579e80906a9 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandOutput.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandOutput.java
@@ -15,30 +15,34 @@
  * Output for command that completes sync migration for a database.
  */
 public class MigrateSyncCompleteCommandOutput {
+    /**
+     * Result identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
     /**
      * List of errors that happened during the command execution.
      */
-    @JsonProperty(value = "errors")
+    @JsonProperty(value = "errors", access = JsonProperty.Access.WRITE_ONLY)
     private List<ReportableException> errors;
 
     /**
-     * Get list of errors that happened during the command execution.
+     * Get result identifier.
      *
-     * @return the errors value
+     * @return the id value
      */
-    public List<ReportableException> errors() {
-        return this.errors;
+    public String id() {
+        return this.id;
     }
 
     /**
-     * Set list of errors that happened during the command execution.
+     * Get list of errors that happened during the command execution.
      *
-     * @param errors the errors value to set
-     * @return the MigrateSyncCompleteCommandOutput object itself.
+     * @return the errors value
      */
-    public MigrateSyncCompleteCommandOutput withErrors(List<ReportableException> errors) {
-        this.errors = errors;
-        return this;
+    public List<ReportableException> errors() {
+        return this.errors;
     }
 
 }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandProperties.java
index 477e139c4f4b..90280d568391 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MigrateSyncCompleteCommandProperties.java
@@ -16,7 +16,7 @@
 /**
  * Properties for the command that completes sync migration for a database.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType", defaultImpl = MigrateSyncCompleteCommandProperties.class)
 @JsonTypeName("Migrate.Sync.Complete.Database")
 public class MigrateSyncCompleteCommandProperties extends CommandPropertiesInner {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbCancelCommand.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbCancelCommand.java
index 776625685df2..c65398e3e76a 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbCancelCommand.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbCancelCommand.java
@@ -16,7 +16,7 @@
 /**
  * Properties for the command that cancels a migration in whole or in part.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType", defaultImpl = MongoDbCancelCommand.class)
 @JsonTypeName("cancel")
 public class MongoDbCancelCommand extends CommandPropertiesInner {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbConnectionInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbConnectionInfo.java
index 3a1b6d17e99e..f41986750ef3 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbConnectionInfo.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbConnectionInfo.java
@@ -15,7 +15,7 @@
 /**
  * Describes a connection to a MongoDB data source.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = MongoDbConnectionInfo.class)
 @JsonTypeName("MongoDbConnectionInfo")
 public class MongoDbConnectionInfo extends ConnectionInfo {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbFinishCommand.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbFinishCommand.java
index a22b8632007a..85f5b0e18af0 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbFinishCommand.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbFinishCommand.java
@@ -16,7 +16,7 @@
 /**
  * Properties for the command that finishes a migration in whole or in part.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType", defaultImpl = MongoDbFinishCommand.class)
 @JsonTypeName("finish")
 public class MongoDbFinishCommand extends CommandPropertiesInner {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbRestartCommand.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbRestartCommand.java
index e453e76a90e4..f47c4cccdfd2 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbRestartCommand.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MongoDbRestartCommand.java
@@ -16,7 +16,7 @@
 /**
  * Properties for the command that restarts a migration in whole or in part.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType", defaultImpl = MongoDbRestartCommand.class)
 @JsonTypeName("restart")
 public class MongoDbRestartCommand extends CommandPropertiesInner {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlConnectionInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlConnectionInfo.java
index b3af8d084b3d..d75e4980374d 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlConnectionInfo.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlConnectionInfo.java
@@ -15,7 +15,7 @@
 /**
  * Information for connecting to MySQL server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = MySqlConnectionInfo.class)
 @JsonTypeName("MySqlConnectionInfo")
 public class MySqlConnectionInfo extends ConnectionInfo {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlTargetPlatformType.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlTargetPlatformType.java
index b0c121f4cfb5..5be2e5b98bf3 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlTargetPlatformType.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/MySqlTargetPlatformType.java
@@ -16,6 +16,9 @@
  * Defines values for MySqlTargetPlatformType.
  */
 public final class MySqlTargetPlatformType extends ExpandableStringEnum<MySqlTargetPlatformType> {
+    /** Static value SqlServer for MySqlTargetPlatformType. */
+    public static final MySqlTargetPlatformType SQL_SERVER = fromString("SqlServer");
+
     /** Static value AzureDbForMySQL for MySqlTargetPlatformType. */
     public static final MySqlTargetPlatformType AZURE_DB_FOR_MY_SQL = fromString("AzureDbForMySQL");
 
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleConnectionInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleConnectionInfo.java
new file mode 100644
index 000000000000..0027f1ada356
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleConnectionInfo.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Information for connecting to Oracle server.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = OracleConnectionInfo.class)
+@JsonTypeName("OracleConnectionInfo")
+public class OracleConnectionInfo extends ConnectionInfo {
+    /**
+     * EZConnect or TNSName connection string.
+     */
+    @JsonProperty(value = "dataSource", required = true)
+    private String dataSource;
+
+    /**
+     * Get eZConnect or TNSName connection string.
+     *
+     * @return the dataSource value
+     */
+    public String dataSource() {
+        return this.dataSource;
+    }
+
+    /**
+     * Set eZConnect or TNSName connection string.
+     *
+     * @param dataSource the dataSource value to set
+     * @return the OracleConnectionInfo object itself.
+     */
+    public OracleConnectionInfo withDataSource(String dataSource) {
+        this.dataSource = dataSource;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleOCIDriverInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleOCIDriverInfo.java
new file mode 100644
index 000000000000..9bcb82a5e74d
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OracleOCIDriverInfo.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information about an Oracle OCI driver.
+ */
+public class OracleOCIDriverInfo {
+    /**
+     * The name of the driver package.
+     */
+    @JsonProperty(value = "driverName", access = JsonProperty.Access.WRITE_ONLY)
+    private String driverName;
+
+    /**
+     * The size in bytes of the driver package.
+     */
+    @JsonProperty(value = "driverSize", access = JsonProperty.Access.WRITE_ONLY)
+    private String driverSize;
+
+    /**
+     * The MD5 Base64 encoded checksum for the driver package.
+     */
+    @JsonProperty(value = "archiveChecksum", access = JsonProperty.Access.WRITE_ONLY)
+    private String archiveChecksum;
+
+    /**
+     * The checksum for the driver package provided by Oracle.
+     */
+    @JsonProperty(value = "oracleChecksum", access = JsonProperty.Access.WRITE_ONLY)
+    private String oracleChecksum;
+
+    /**
+     * Version listed in the OCI assembly 'oci.dll'.
+     */
+    @JsonProperty(value = "assemblyVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String assemblyVersion;
+
+    /**
+     * List of Oracle database versions supported by this driver. Only major
+     * minor of the version is listed.
+     */
+    @JsonProperty(value = "supportedOracleVersions", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> supportedOracleVersions;
+
+    /**
+     * Get the name of the driver package.
+     *
+     * @return the driverName value
+     */
+    public String driverName() {
+        return this.driverName;
+    }
+
+    /**
+     * Get the size in bytes of the driver package.
+     *
+     * @return the driverSize value
+     */
+    public String driverSize() {
+        return this.driverSize;
+    }
+
+    /**
+     * Get the MD5 Base64 encoded checksum for the driver package.
+     *
+     * @return the archiveChecksum value
+     */
+    public String archiveChecksum() {
+        return this.archiveChecksum;
+    }
+
+    /**
+     * Get the checksum for the driver package provided by Oracle.
+     *
+     * @return the oracleChecksum value
+     */
+    public String oracleChecksum() {
+        return this.oracleChecksum;
+    }
+
+    /**
+     * Get version listed in the OCI assembly 'oci.dll'.
+     *
+     * @return the assemblyVersion value
+     */
+    public String assemblyVersion() {
+        return this.assemblyVersion;
+    }
+
+    /**
+     * Get list of Oracle database versions supported by this driver. Only major minor of the version is listed.
+     *
+     * @return the supportedOracleVersions value
+     */
+    public List<String> supportedOracleVersions() {
+        return this.supportedOracleVersions;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OrphanedUserInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OrphanedUserInfo.java
new file mode 100644
index 000000000000..91da19be880d
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/OrphanedUserInfo.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information of orphaned users on the SQL server database.
+ */
+public class OrphanedUserInfo {
+    /**
+     * Name of the orphaned user.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Parent database of the user.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * Get name of the orphaned user.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the orphaned user.
+     *
+     * @param name the name value to set
+     * @return the OrphanedUserInfo object itself.
+     */
+    public OrphanedUserInfo withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get parent database of the user.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set parent database of the user.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the OrphanedUserInfo object itself.
+     */
+    public OrphanedUserInfo withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/PostgreSqlConnectionInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/PostgreSqlConnectionInfo.java
index aa2445651087..5781c09c37b6 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/PostgreSqlConnectionInfo.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/PostgreSqlConnectionInfo.java
@@ -15,7 +15,7 @@
 /**
  * Information for connecting to PostgreSQL server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = PostgreSqlConnectionInfo.class)
 @JsonTypeName("PostgreSqlConnectionInfo")
 public class PostgreSqlConnectionInfo extends ConnectionInfo {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectTask.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectServiceProjectTask.java
similarity index 72%
rename from datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectTask.java
rename to datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectServiceProjectTask.java
index 72f10fe0c1e3..83c596c98161 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectTask.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectServiceProjectTask.java
@@ -19,9 +19,9 @@
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.implementation.DataMigrationManager;
 
 /**
- * Type representing ProjectTask.
+ * Type representing ProjectServiceProjectTask.
  */
-public interface ProjectTask extends HasInner<ProjectTaskInner>, Indexable, Refreshable<ProjectTask>, Updatable<ProjectTask.Update>, HasManager<DataMigrationManager> {
+public interface ProjectServiceProjectTask extends HasInner<ProjectTaskInner>, Indexable, Refreshable<ProjectServiceProjectTask>, Updatable<ProjectServiceProjectTask.Update>, HasManager<DataMigrationManager> {
     /**
      * @return the etag value.
      */
@@ -48,23 +48,23 @@ public interface ProjectTask extends HasInner<ProjectTaskInner>, Indexable, Refr
     String type();
 
     /**
-     * The entirety of the ProjectTask definition.
+     * The entirety of the ProjectServiceProjectTask definition.
      */
     interface Definition extends DefinitionStages.Blank, DefinitionStages.WithProject, DefinitionStages.WithCreate {
     }
 
     /**
-     * Grouping of ProjectTask definition stages.
+     * Grouping of ProjectServiceProjectTask definition stages.
      */
     interface DefinitionStages {
         /**
-         * The first stage of a ProjectTask definition.
+         * The first stage of a ProjectServiceProjectTask definition.
          */
         interface Blank extends WithProject {
         }
 
         /**
-         * The stage of the projecttask definition allowing to specify Project.
+         * The stage of the projectserviceprojecttask definition allowing to specify Project.
          */
         interface WithProject {
            /**
@@ -78,7 +78,7 @@ interface WithProject {
         }
 
         /**
-         * The stage of the projecttask definition allowing to specify Etag.
+         * The stage of the projectserviceprojecttask definition allowing to specify Etag.
          */
         interface WithEtag {
             /**
@@ -90,7 +90,7 @@ interface WithEtag {
         }
 
         /**
-         * The stage of the projecttask definition allowing to specify Properties.
+         * The stage of the projectserviceprojecttask definition allowing to specify Properties.
          */
         interface WithProperties {
             /**
@@ -106,21 +106,21 @@ interface WithProperties {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<ProjectTask>, DefinitionStages.WithEtag, DefinitionStages.WithProperties {
+        interface WithCreate extends Creatable<ProjectServiceProjectTask>, DefinitionStages.WithEtag, DefinitionStages.WithProperties {
         }
     }
     /**
-     * The template for a ProjectTask update operation, containing all the settings that can be modified.
+     * The template for a ProjectServiceProjectTask update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<ProjectTask>, UpdateStages.WithEtag, UpdateStages.WithProperties {
+    interface Update extends Appliable<ProjectServiceProjectTask>, UpdateStages.WithEtag, UpdateStages.WithProperties {
     }
 
     /**
-     * Grouping of ProjectTask update stages.
+     * Grouping of ProjectServiceProjectTask update stages.
      */
     interface UpdateStages {
         /**
-         * The stage of the projecttask update allowing to specify Etag.
+         * The stage of the projectserviceprojecttask update allowing to specify Etag.
          */
         interface WithEtag {
             /**
@@ -132,7 +132,7 @@ interface WithEtag {
         }
 
         /**
-         * The stage of the projecttask update allowing to specify Properties.
+         * The stage of the projectserviceprojecttask update allowing to specify Properties.
          */
         interface WithProperties {
             /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectTaskProperties.java
index 1f3acd12a433..6d7aec823e68 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ProjectTaskProperties.java
@@ -20,30 +20,45 @@
  * Base class for all types of DMS task properties. If task is not supported by
  * current client, this object is returned.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ProjectTaskProperties.class)
 @JsonTypeName("Unknown")
 @JsonSubTypes({
+    @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureDbSqlMi.Complete", value = MigrateMISyncCompleteCommandProperties.class),
     @JsonSubTypes.Type(name = "Migrate.Sync.Complete.Database", value = MigrateSyncCompleteCommandProperties.class),
+    @JsonSubTypes.Type(name = "MiSqlConnectionInfo", value = MiSqlConnectionInfo.class),
     @JsonSubTypes.Type(name = "PostgreSqlConnectionInfo", value = PostgreSqlConnectionInfo.class),
+    @JsonSubTypes.Type(name = "OracleConnectionInfo", value = OracleConnectionInfo.class),
     @JsonSubTypes.Type(name = "MySqlConnectionInfo", value = MySqlConnectionInfo.class),
     @JsonSubTypes.Type(name = "MongoDbConnectionInfo", value = MongoDbConnectionInfo.class),
     @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class),
+    @JsonSubTypes.Type(name = "Migrate.Ssis", value = MigrateSsisTaskProperties.class),
     @JsonSubTypes.Type(name = "GetTDECertificates.Sql", value = GetTdeCertificatesSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "Validate.Oracle.AzureDbPostgreSql.Sync", value = ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Validate.MongoDb", value = ValidateMongoDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI.Sync.LRS", value = ValidateMigrationInputSqlServerSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI", value = ValidateMigrationInputSqlServerSqlMITaskProperties.class),
     @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.SqlDb.Sync", value = ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "Migrate.Oracle.AzureDbForPostgreSql.Sync", value = MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.PostgreSql.AzureDbForPostgreSql.Sync", value = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.MySql.AzureDbForMySql.Sync", value = MigrateMySqlAzureDbForMySqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDb.Sync", value = MigrateSqlServerSqlDbSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.SqlDb", value = MigrateSqlServerSqlDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI.Sync.LRS", value = MigrateSqlServerSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI", value = MigrateSqlServerSqlMITaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.MongoDb", value = MigrateMongoDbTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.AzureDbForMySql", value = ConnectToTargetAzureDbForMySqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.AzureSqlDbMI.Sync.LRS", value = ConnectToTargetSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.AzureSqlDbMI", value = ConnectToTargetSqlMITaskProperties.class),
+    @JsonSubTypes.Type(name = "GetUserTablesPostgreSql", value = GetUserTablesPostgreSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "GetUserTablesOracle", value = GetUserTablesOracleTaskProperties.class),
     @JsonSubTypes.Type(name = "GetUserTables.AzureSqlDb.Sync", value = GetUserTablesSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "GetUserTables.Sql", value = GetUserTablesSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.Oracle.AzureDbForPostgreSql.Sync", value = ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.AzureDbForPostgreSql.Sync", value = ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb.Sync", value = ConnectToTargetSqlSqlDbSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb", value = ConnectToTargetSqlDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToSource.Oracle.Sync", value = ConnectToSourceOracleSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToSource.PostgreSql.Sync", value = ConnectToSourcePostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToSource.SqlServer.Sync", value = ConnectToSourceSqlServerSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToSource.SqlServer", value = ConnectToSourceSqlServerTaskProperties.class),
     @JsonSubTypes.Type(name = "Connect.MongoDb", value = ConnectToMongoDbTaskProperties.class),
@@ -51,7 +66,10 @@
     @JsonSubTypes.Type(name = "MigrateSchemaSqlServerSqlDb", value = MigrateSchemaSqlServerSqlDbTaskProperties.class),
     @JsonSubTypes.Type(name = "cancel", value = MongoDbCancelCommand.class),
     @JsonSubTypes.Type(name = "finish", value = MongoDbFinishCommand.class),
-    @JsonSubTypes.Type(name = "restart", value = MongoDbRestartCommand.class)
+    @JsonSubTypes.Type(name = "restart", value = MongoDbRestartCommand.class),
+    @JsonSubTypes.Type(name = "Service.Check.OCI", value = CheckOCIDriverTaskProperties.class),
+    @JsonSubTypes.Type(name = "Service.Upload.OCI", value = UploadOCIDriverTaskProperties.class),
+    @JsonSubTypes.Type(name = "Service.Install.OCI", value = InstallOCIDriverTaskProperties.class)
 })
 public class ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerLevelPermissionsGroup.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerLevelPermissionsGroup.java
index e86211dc366a..a1b0508b4c23 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerLevelPermissionsGroup.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerLevelPermissionsGroup.java
@@ -8,40 +8,52 @@
 
 package com.microsoft.azure.management.datamigration.v2018_07_15_preview;
 
-import java.util.Collection;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.microsoft.rest.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Defines values for ServerLevelPermissionsGroup.
  */
-public final class ServerLevelPermissionsGroup extends ExpandableStringEnum<ServerLevelPermissionsGroup> {
-    /** Static value Default for ServerLevelPermissionsGroup. */
-    public static final ServerLevelPermissionsGroup DEFAULT = fromString("Default");
+public enum ServerLevelPermissionsGroup {
+    /** Enum value Default. */
+    DEFAULT("Default"),
 
-    /** Static value MigrationFromSqlServerToAzureDB for ServerLevelPermissionsGroup. */
-    public static final ServerLevelPermissionsGroup MIGRATION_FROM_SQL_SERVER_TO_AZURE_DB = fromString("MigrationFromSqlServerToAzureDB");
+    /** Enum value MigrationFromSqlServerToAzureDB. */
+    MIGRATION_FROM_SQL_SERVER_TO_AZURE_DB("MigrationFromSqlServerToAzureDB"),
 
-    /** Static value MigrationFromSqlServerToAzureMI for ServerLevelPermissionsGroup. */
-    public static final ServerLevelPermissionsGroup MIGRATION_FROM_SQL_SERVER_TO_AZURE_MI = fromString("MigrationFromSqlServerToAzureMI");
+    /** Enum value MigrationFromSqlServerToAzureMI. */
+    MIGRATION_FROM_SQL_SERVER_TO_AZURE_MI("MigrationFromSqlServerToAzureMI"),
 
-    /** Static value MigrationFromMySQLToAzureDBForMySQL for ServerLevelPermissionsGroup. */
-    public static final ServerLevelPermissionsGroup MIGRATION_FROM_MY_SQLTO_AZURE_DBFOR_MY_SQL = fromString("MigrationFromMySQLToAzureDBForMySQL");
+    /** Enum value MigrationFromMySQLToAzureDBForMySQL. */
+    MIGRATION_FROM_MY_SQLTO_AZURE_DBFOR_MY_SQL("MigrationFromMySQLToAzureDBForMySQL");
+
+    /** The actual serialized value for a ServerLevelPermissionsGroup instance. */
+    private String value;
+
+    ServerLevelPermissionsGroup(String value) {
+        this.value = value;
+    }
 
     /**
-     * Creates or finds a ServerLevelPermissionsGroup from its string representation.
-     * @param name a name to look for
-     * @return the corresponding ServerLevelPermissionsGroup
+     * Parses a serialized value to a ServerLevelPermissionsGroup instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed ServerLevelPermissionsGroup object, or null if unable to parse.
      */
     @JsonCreator
-    public static ServerLevelPermissionsGroup fromString(String name) {
-        return fromString(name, ServerLevelPermissionsGroup.class);
+    public static ServerLevelPermissionsGroup fromString(String value) {
+        ServerLevelPermissionsGroup[] items = ServerLevelPermissionsGroup.values();
+        for (ServerLevelPermissionsGroup item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
     }
 
-    /**
-     * @return known ServerLevelPermissionsGroup values
-     */
-    public static Collection<ServerLevelPermissionsGroup> values() {
-        return values(ServerLevelPermissionsGroup.class);
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
     }
 }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerProperties.java
index 03c792ab79f1..82000259828a 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServerProperties.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Server properties for Oracle, MySQL type source.
+ * Server properties for MySQL type source.
  */
 public class ServerProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceProjectTask.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceProjectTask.java
new file mode 100644
index 000000000000..2617c7091276
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceProjectTask.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.datamigration.v2018_07_15_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.implementation.ProjectTaskInner;
+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.datamigration.v2018_07_15_preview.implementation.DataMigrationManager;
+
+/**
+ * Type representing ServiceProjectTask.
+ */
+public interface ServiceProjectTask extends HasInner<ProjectTaskInner>, Indexable, Refreshable<ServiceProjectTask>, Updatable<ServiceProjectTask.Update>, HasManager<DataMigrationManager> {
+    /**
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the properties value.
+     */
+    ProjectTaskProperties properties();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ServiceProjectTask definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithService, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ServiceProjectTask definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ServiceProjectTask definition.
+         */
+        interface Blank extends WithService {
+        }
+
+        /**
+         * The stage of the serviceprojecttask definition allowing to specify Service.
+         */
+        interface WithService {
+           /**
+            * Specifies groupName, serviceName.
+            * @param groupName Name of the resource group
+            * @param serviceName Name of the service
+            * @return the next definition stage
+            */
+            WithCreate withExistingService(String groupName, String serviceName);
+        }
+
+        /**
+         * The stage of the serviceprojecttask definition allowing to specify Etag.
+         */
+        interface WithEtag {
+            /**
+             * Specifies etag.
+             * @param etag HTTP strong entity tag value. This is ignored if submitted
+             * @return the next definition stage
+             */
+            WithCreate withEtag(String etag);
+        }
+
+        /**
+         * The stage of the serviceprojecttask definition allowing to specify Properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies properties.
+             * @param properties Custom task properties
+             * @return the next definition stage
+             */
+            WithCreate withProperties(ProjectTaskProperties properties);
+        }
+
+        /**
+         * 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<ServiceProjectTask>, DefinitionStages.WithEtag, DefinitionStages.WithProperties {
+        }
+    }
+    /**
+     * The template for a ServiceProjectTask update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ServiceProjectTask>, UpdateStages.WithEtag, UpdateStages.WithProperties {
+    }
+
+    /**
+     * Grouping of ServiceProjectTask update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the serviceprojecttask update allowing to specify Etag.
+         */
+        interface WithEtag {
+            /**
+             * Specifies etag.
+             * @param etag HTTP strong entity tag value. This is ignored if submitted
+             * @return the next update stage
+             */
+            Update withEtag(String etag);
+        }
+
+        /**
+         * The stage of the serviceprojecttask update allowing to specify Properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies properties.
+             * @param properties Custom task properties
+             * @return the next update stage
+             */
+            Update withProperties(ProjectTaskProperties properties);
+        }
+
+    }
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceTasks.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceTasks.java
new file mode 100644
index 000000000000..4a9677b47c49
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ServiceTasks.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.datamigration.v2018_07_15_preview;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.implementation.ServiceTasksInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ServiceTasks.
+ */
+public interface ServiceTasks extends SupportsCreating<ServiceProjectTask.DefinitionStages.Blank>, HasInner<ServiceTasksInner> {
+    /**
+     * Cancel a service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. This method cancels a service task if it's currently queued or running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ProjectServiceProjectTask> cancelAsync(String groupName, String serviceName, String taskName);
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ServiceProjectTask> getAsync(String groupName, String serviceName, String taskName);
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ServiceProjectTask> listAsync(final String groupName, final String serviceName);
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String groupName, String serviceName, String taskName);
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlConnectionInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlConnectionInfo.java
index 716cd62a97eb..232f4842ded4 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlConnectionInfo.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlConnectionInfo.java
@@ -15,7 +15,7 @@
 /**
  * Information for connecting to SQL database server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = SqlConnectionInfo.class)
 @JsonTypeName("SqlConnectionInfo")
 public class SqlConnectionInfo extends ConnectionInfo {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlServerSqlMISyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlServerSqlMISyncTaskInput.java
new file mode 100644
index 000000000000..1cec5ed75dd2
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SqlServerSqlMISyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for task that migrates SQL Server databases to Azure SQL Database
+ * Managed Instance online scenario.
+ */
+public class SqlServerSqlMISyncTaskInput {
+    /**
+     * Databases to migrate.
+     */
+    @JsonProperty(value = "selectedDatabases", required = true)
+    private List<MigrateSqlServerSqlMIDatabaseInput> selectedDatabases;
+
+    /**
+     * Backup file share information for all selected databases.
+     */
+    @JsonProperty(value = "backupFileShare")
+    private FileShare backupFileShare;
+
+    /**
+     * Fully qualified resourceId of storage.
+     */
+    @JsonProperty(value = "storageResourceId", required = true)
+    private String storageResourceId;
+
+    /**
+     * Connection information for source SQL Server.
+     */
+    @JsonProperty(value = "sourceConnectionInfo", required = true)
+    private SqlConnectionInfo sourceConnectionInfo;
+
+    /**
+     * Connection information for Azure SQL Database Managed Instance.
+     */
+    @JsonProperty(value = "targetConnectionInfo", required = true)
+    private MiSqlConnectionInfo targetConnectionInfo;
+
+    /**
+     * Azure Active Directory Application the DMS instance will use to connect
+     * to the target instance of Azure SQL Database Managed Instance and the
+     * Azure Storage Account.
+     */
+    @JsonProperty(value = "azureApp", required = true)
+    private AzureActiveDirectoryApp azureApp;
+
+    /**
+     * Get databases to migrate.
+     *
+     * @return the selectedDatabases value
+     */
+    public List<MigrateSqlServerSqlMIDatabaseInput> selectedDatabases() {
+        return this.selectedDatabases;
+    }
+
+    /**
+     * Set databases to migrate.
+     *
+     * @param selectedDatabases the selectedDatabases value to set
+     * @return the SqlServerSqlMISyncTaskInput object itself.
+     */
+    public SqlServerSqlMISyncTaskInput withSelectedDatabases(List<MigrateSqlServerSqlMIDatabaseInput> selectedDatabases) {
+        this.selectedDatabases = selectedDatabases;
+        return this;
+    }
+
+    /**
+     * Get backup file share information for all selected databases.
+     *
+     * @return the backupFileShare value
+     */
+    public FileShare backupFileShare() {
+        return this.backupFileShare;
+    }
+
+    /**
+     * Set backup file share information for all selected databases.
+     *
+     * @param backupFileShare the backupFileShare value to set
+     * @return the SqlServerSqlMISyncTaskInput object itself.
+     */
+    public SqlServerSqlMISyncTaskInput withBackupFileShare(FileShare backupFileShare) {
+        this.backupFileShare = backupFileShare;
+        return this;
+    }
+
+    /**
+     * Get fully qualified resourceId of storage.
+     *
+     * @return the storageResourceId value
+     */
+    public String storageResourceId() {
+        return this.storageResourceId;
+    }
+
+    /**
+     * Set fully qualified resourceId of storage.
+     *
+     * @param storageResourceId the storageResourceId value to set
+     * @return the SqlServerSqlMISyncTaskInput object itself.
+     */
+    public SqlServerSqlMISyncTaskInput withStorageResourceId(String storageResourceId) {
+        this.storageResourceId = storageResourceId;
+        return this;
+    }
+
+    /**
+     * Get connection information for source SQL Server.
+     *
+     * @return the sourceConnectionInfo value
+     */
+    public SqlConnectionInfo sourceConnectionInfo() {
+        return this.sourceConnectionInfo;
+    }
+
+    /**
+     * Set connection information for source SQL Server.
+     *
+     * @param sourceConnectionInfo the sourceConnectionInfo value to set
+     * @return the SqlServerSqlMISyncTaskInput object itself.
+     */
+    public SqlServerSqlMISyncTaskInput withSourceConnectionInfo(SqlConnectionInfo sourceConnectionInfo) {
+        this.sourceConnectionInfo = sourceConnectionInfo;
+        return this;
+    }
+
+    /**
+     * Get connection information for Azure SQL Database Managed Instance.
+     *
+     * @return the targetConnectionInfo value
+     */
+    public MiSqlConnectionInfo targetConnectionInfo() {
+        return this.targetConnectionInfo;
+    }
+
+    /**
+     * Set connection information for Azure SQL Database Managed Instance.
+     *
+     * @param targetConnectionInfo the targetConnectionInfo value to set
+     * @return the SqlServerSqlMISyncTaskInput object itself.
+     */
+    public SqlServerSqlMISyncTaskInput withTargetConnectionInfo(MiSqlConnectionInfo targetConnectionInfo) {
+        this.targetConnectionInfo = targetConnectionInfo;
+        return this;
+    }
+
+    /**
+     * Get azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account.
+     *
+     * @return the azureApp value
+     */
+    public AzureActiveDirectoryApp azureApp() {
+        return this.azureApp;
+    }
+
+    /**
+     * Set azure Active Directory Application the DMS instance will use to connect to the target instance of Azure SQL Database Managed Instance and the Azure Storage Account.
+     *
+     * @param azureApp the azureApp value to set
+     * @return the SqlServerSqlMISyncTaskInput object itself.
+     */
+    public SqlServerSqlMISyncTaskInput withAzureApp(AzureActiveDirectoryApp azureApp) {
+        this.azureApp = azureApp;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationInfo.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationInfo.java
new file mode 100644
index 000000000000..66cc73677cab
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationInfo.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SSIS migration info with SSIS store type, overwrite policy.
+ */
+public class SsisMigrationInfo {
+    /**
+     * The SSIS store type of source, only SSIS catalog is supported now in
+     * DMS. Possible values include: 'SsisCatalog'.
+     */
+    @JsonProperty(value = "ssisStoreType")
+    private SsisStoreType ssisStoreType;
+
+    /**
+     * The overwrite option for the SSIS project migration. Possible values
+     * include: 'Ignore', 'Overwrite'.
+     */
+    @JsonProperty(value = "projectOverwriteOption")
+    private SsisMigrationOverwriteOption projectOverwriteOption;
+
+    /**
+     * The overwrite option for the SSIS environment migration. Possible values
+     * include: 'Ignore', 'Overwrite'.
+     */
+    @JsonProperty(value = "environmentOverwriteOption")
+    private SsisMigrationOverwriteOption environmentOverwriteOption;
+
+    /**
+     * Get the SSIS store type of source, only SSIS catalog is supported now in DMS. Possible values include: 'SsisCatalog'.
+     *
+     * @return the ssisStoreType value
+     */
+    public SsisStoreType ssisStoreType() {
+        return this.ssisStoreType;
+    }
+
+    /**
+     * Set the SSIS store type of source, only SSIS catalog is supported now in DMS. Possible values include: 'SsisCatalog'.
+     *
+     * @param ssisStoreType the ssisStoreType value to set
+     * @return the SsisMigrationInfo object itself.
+     */
+    public SsisMigrationInfo withSsisStoreType(SsisStoreType ssisStoreType) {
+        this.ssisStoreType = ssisStoreType;
+        return this;
+    }
+
+    /**
+     * Get the overwrite option for the SSIS project migration. Possible values include: 'Ignore', 'Overwrite'.
+     *
+     * @return the projectOverwriteOption value
+     */
+    public SsisMigrationOverwriteOption projectOverwriteOption() {
+        return this.projectOverwriteOption;
+    }
+
+    /**
+     * Set the overwrite option for the SSIS project migration. Possible values include: 'Ignore', 'Overwrite'.
+     *
+     * @param projectOverwriteOption the projectOverwriteOption value to set
+     * @return the SsisMigrationInfo object itself.
+     */
+    public SsisMigrationInfo withProjectOverwriteOption(SsisMigrationOverwriteOption projectOverwriteOption) {
+        this.projectOverwriteOption = projectOverwriteOption;
+        return this;
+    }
+
+    /**
+     * Get the overwrite option for the SSIS environment migration. Possible values include: 'Ignore', 'Overwrite'.
+     *
+     * @return the environmentOverwriteOption value
+     */
+    public SsisMigrationOverwriteOption environmentOverwriteOption() {
+        return this.environmentOverwriteOption;
+    }
+
+    /**
+     * Set the overwrite option for the SSIS environment migration. Possible values include: 'Ignore', 'Overwrite'.
+     *
+     * @param environmentOverwriteOption the environmentOverwriteOption value to set
+     * @return the SsisMigrationInfo object itself.
+     */
+    public SsisMigrationInfo withEnvironmentOverwriteOption(SsisMigrationOverwriteOption environmentOverwriteOption) {
+        this.environmentOverwriteOption = environmentOverwriteOption;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationOverwriteOption.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationOverwriteOption.java
new file mode 100644
index 000000000000..ba0140aca9f3
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationOverwriteOption.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.datamigration.v2018_07_15_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SsisMigrationOverwriteOption.
+ */
+public final class SsisMigrationOverwriteOption extends ExpandableStringEnum<SsisMigrationOverwriteOption> {
+    /** Static value Ignore for SsisMigrationOverwriteOption. */
+    public static final SsisMigrationOverwriteOption IGNORE = fromString("Ignore");
+
+    /** Static value Overwrite for SsisMigrationOverwriteOption. */
+    public static final SsisMigrationOverwriteOption OVERWRITE = fromString("Overwrite");
+
+    /**
+     * Creates or finds a SsisMigrationOverwriteOption from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SsisMigrationOverwriteOption
+     */
+    @JsonCreator
+    public static SsisMigrationOverwriteOption fromString(String name) {
+        return fromString(name, SsisMigrationOverwriteOption.class);
+    }
+
+    /**
+     * @return known SsisMigrationOverwriteOption values
+     */
+    public static Collection<SsisMigrationOverwriteOption> values() {
+        return values(SsisMigrationOverwriteOption.class);
+    }
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationStage.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationStage.java
new file mode 100644
index 000000000000..fb489f433a2a
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisMigrationStage.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.datamigration.v2018_07_15_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SsisMigrationStage.
+ */
+public final class SsisMigrationStage extends ExpandableStringEnum<SsisMigrationStage> {
+    /** Static value None for SsisMigrationStage. */
+    public static final SsisMigrationStage NONE = fromString("None");
+
+    /** Static value Initialize for SsisMigrationStage. */
+    public static final SsisMigrationStage INITIALIZE = fromString("Initialize");
+
+    /** Static value InProgress for SsisMigrationStage. */
+    public static final SsisMigrationStage IN_PROGRESS = fromString("InProgress");
+
+    /** Static value Completed for SsisMigrationStage. */
+    public static final SsisMigrationStage COMPLETED = fromString("Completed");
+
+    /**
+     * Creates or finds a SsisMigrationStage from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SsisMigrationStage
+     */
+    @JsonCreator
+    public static SsisMigrationStage fromString(String name) {
+        return fromString(name, SsisMigrationStage.class);
+    }
+
+    /**
+     * @return known SsisMigrationStage values
+     */
+    public static Collection<SsisMigrationStage> values() {
+        return values(SsisMigrationStage.class);
+    }
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisStoreType.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisStoreType.java
new file mode 100644
index 000000000000..ca5db2bac8e4
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/SsisStoreType.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.datamigration.v2018_07_15_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SsisStoreType.
+ */
+public final class SsisStoreType extends ExpandableStringEnum<SsisStoreType> {
+    /** Static value SsisCatalog for SsisStoreType. */
+    public static final SsisStoreType SSIS_CATALOG = fromString("SsisCatalog");
+
+    /**
+     * Creates or finds a SsisStoreType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SsisStoreType
+     */
+    @JsonCreator
+    public static SsisStoreType fromString(String name) {
+        return fromString(name, SsisStoreType.class);
+    }
+
+    /**
+     * @return known SsisStoreType values
+     */
+    public static Collection<SsisStoreType> values() {
+        return values(SsisStoreType.class);
+    }
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/Tasks.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/Tasks.java
index 42a4beec4b10..c406b9bbab53 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/Tasks.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/Tasks.java
@@ -18,7 +18,7 @@
 /**
  * Type representing Tasks.
  */
-public interface Tasks extends SupportsCreating<ProjectTask.DefinitionStages.Blank>, HasInner<TasksInner> {
+public interface Tasks extends SupportsCreating<ProjectServiceProjectTask.DefinitionStages.Blank>, HasInner<TasksInner> {
     /**
      * Cancel a task.
      * The tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. This method cancels a task if it's currently queued or running.
@@ -30,7 +30,7 @@ public interface Tasks extends SupportsCreating<ProjectTask.DefinitionStages.Bla
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ProjectTask> cancelAsync(String groupName, String serviceName, String projectName, String taskName);
+    Observable<ProjectServiceProjectTask> cancelAsync(String groupName, String serviceName, String projectName, String taskName);
 
     /**
      * Execute a command on a task.
@@ -57,7 +57,7 @@ public interface Tasks extends SupportsCreating<ProjectTask.DefinitionStages.Bla
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ProjectTask> getAsync(String groupName, String serviceName, String projectName, String taskName);
+    Observable<ProjectServiceProjectTask> getAsync(String groupName, String serviceName, String projectName, String taskName);
 
     /**
      * Get tasks in a service.
@@ -69,7 +69,7 @@ public interface Tasks extends SupportsCreating<ProjectTask.DefinitionStages.Bla
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ProjectTask> listAsync(final String groupName, final String serviceName, final String projectName);
+    Observable<ProjectServiceProjectTask> listAsync(final String groupName, final String serviceName, final String projectName);
 
     /**
      * Delete task.
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskInput.java
new file mode 100644
index 000000000000..8cef7aad85ab
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskInput.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.datamigration.v2018_07_15_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Input for the service task to upload an OCI driver.
+ */
+public class UploadOCIDriverTaskInput {
+    /**
+     * File share information for the OCI driver archive.
+     */
+    @JsonProperty(value = "driverShare")
+    private FileShare driverShare;
+
+    /**
+     * Get file share information for the OCI driver archive.
+     *
+     * @return the driverShare value
+     */
+    public FileShare driverShare() {
+        return this.driverShare;
+    }
+
+    /**
+     * Set file share information for the OCI driver archive.
+     *
+     * @param driverShare the driverShare value to set
+     * @return the UploadOCIDriverTaskInput object itself.
+     */
+    public UploadOCIDriverTaskInput withDriverShare(FileShare driverShare) {
+        this.driverShare = driverShare;
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskOutput.java
new file mode 100644
index 000000000000..10ae49aa4f25
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for the service task to upload an OCI driver.
+ */
+public class UploadOCIDriverTaskOutput {
+    /**
+     * The name of the driver package that was validated and uploaded.
+     */
+    @JsonProperty(value = "driverPackageName", access = JsonProperty.Access.WRITE_ONLY)
+    private String driverPackageName;
+
+    /**
+     * Validation errors.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get the name of the driver package that was validated and uploaded.
+     *
+     * @return the driverPackageName value
+     */
+    public String driverPackageName() {
+        return this.driverPackageName;
+    }
+
+    /**
+     * Get validation errors.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskProperties.java
new file mode 100644
index 000000000000..c58ac0af9119
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/UploadOCIDriverTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that uploads an OCI driver.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = UploadOCIDriverTaskProperties.class)
+@JsonTypeName("Service.Upload.OCI")
+public class UploadOCIDriverTaskProperties extends ProjectTaskProperties {
+    /**
+     * The input property.
+     */
+    @JsonProperty(value = "input")
+    private UploadOCIDriverTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<UploadOCIDriverTaskOutput> output;
+
+    /**
+     * Get the input value.
+     *
+     * @return the input value
+     */
+    public UploadOCIDriverTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set the input value.
+     *
+     * @param input the input value to set
+     * @return the UploadOCIDriverTaskProperties object itself.
+     */
+    public UploadOCIDriverTaskProperties withInput(UploadOCIDriverTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<UploadOCIDriverTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.java
index c6c0bc30c57f..e7a68ebed9b0 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for task that validates migration input for SQL to Azure SQL DB
  * sync migrations.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.class)
 @JsonTypeName("ValidateMigrationInput.SqlServer.SqlDb.Sync")
 public class ValidateMigrationInputSqlServerSqlDbSyncTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskInput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskInput.java
new file mode 100644
index 000000000000..121bb510172d
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskInput.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.datamigration.v2018_07_15_preview;
+
+
+/**
+ * Input for task that migrates SQL Server databases to Azure SQL Database
+ * Managed Instance online scenario.
+ */
+public class ValidateMigrationInputSqlServerSqlMISyncTaskInput extends SqlServerSqlMISyncTaskInput {
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskOutput.java
new file mode 100644
index 000000000000..b18135b4428a
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for task that validates migration input for Azure SQL Database
+ * Managed Instance online migration.
+ */
+public class ValidateMigrationInputSqlServerSqlMISyncTaskOutput {
+    /**
+     * Database identifier.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Name of database.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Errors associated with a selected database object.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get database identifier.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get name of database.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get errors associated with a selected database object.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskProperties.java
new file mode 100644
index 000000000000..f778e5b56314
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMISyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for task that validates migration input for SQL to Azure SQL
+ * Database Managed Instance sync scenario.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ValidateMigrationInputSqlServerSqlMISyncTaskProperties.class)
+@JsonTypeName("ValidateMigrationInput.SqlServer.AzureSqlDbMI.Sync.LRS")
+public class ValidateMigrationInputSqlServerSqlMISyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * Task input.
+     */
+    @JsonProperty(value = "input")
+    private ValidateMigrationInputSqlServerSqlMISyncTaskInput input;
+
+    /**
+     * Task output. This is ignored if submitted.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ValidateMigrationInputSqlServerSqlMISyncTaskOutput> output;
+
+    /**
+     * Get task input.
+     *
+     * @return the input value
+     */
+    public ValidateMigrationInputSqlServerSqlMISyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set task input.
+     *
+     * @param input the input value to set
+     * @return the ValidateMigrationInputSqlServerSqlMISyncTaskProperties object itself.
+     */
+    public ValidateMigrationInputSqlServerSqlMISyncTaskProperties withInput(ValidateMigrationInputSqlServerSqlMISyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get task output. This is ignored if submitted.
+     *
+     * @return the output value
+     */
+    public List<ValidateMigrationInputSqlServerSqlMISyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java
index 9afa2fec22ca..8ae6d958e642 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for task that validates migration input for SQL to Azure SQL
  * Database Managed Instance.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ValidateMigrationInputSqlServerSqlMITaskProperties.class)
 @JsonTypeName("ValidateMigrationInput.SqlServer.AzureSqlDbMI")
 public class ValidateMigrationInputSqlServerSqlMITaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMongoDbTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMongoDbTaskProperties.java
index e73d686b05ae..c96f8bb9eed3 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMongoDbTaskProperties.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateMongoDbTaskProperties.java
@@ -17,7 +17,7 @@
  * Properties for the task that validates a migration between MongoDB data
  * sources.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ValidateMongoDbTaskProperties.class)
 @JsonTypeName("Validate.MongoDb")
 public class ValidateMongoDbTaskProperties extends ProjectTaskProperties {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.java
new file mode 100644
index 000000000000..e6c54967a24a
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Properties for the task that validates a migration for Oracle to Azure
+ * Database for PostgreSQL for online migrations.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.class)
+@JsonTypeName("Validate.Oracle.AzureDbPostgreSql.Sync")
+public class ValidateOracleAzureDbForPostgreSqlSyncTaskProperties extends ProjectTaskProperties {
+    /**
+     * The input property.
+     */
+    @JsonProperty(value = "input")
+    private MigrateOracleAzureDbPostgreSqlSyncTaskInput input;
+
+    /**
+     * An array containing a single validation error response object.
+     */
+    @JsonProperty(value = "output", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ValidateOracleAzureDbPostgreSqlSyncTaskOutput> output;
+
+    /**
+     * Get the input value.
+     *
+     * @return the input value
+     */
+    public MigrateOracleAzureDbPostgreSqlSyncTaskInput input() {
+        return this.input;
+    }
+
+    /**
+     * Set the input value.
+     *
+     * @param input the input value to set
+     * @return the ValidateOracleAzureDbForPostgreSqlSyncTaskProperties object itself.
+     */
+    public ValidateOracleAzureDbForPostgreSqlSyncTaskProperties withInput(MigrateOracleAzureDbPostgreSqlSyncTaskInput input) {
+        this.input = input;
+        return this;
+    }
+
+    /**
+     * Get an array containing a single validation error response object.
+     *
+     * @return the output value
+     */
+    public List<ValidateOracleAzureDbPostgreSqlSyncTaskOutput> output() {
+        return this.output;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbPostgreSqlSyncTaskOutput.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbPostgreSqlSyncTaskOutput.java
new file mode 100644
index 000000000000..7128e36b15cd
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/ValidateOracleAzureDbPostgreSqlSyncTaskOutput.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.datamigration.v2018_07_15_preview;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Output for task that validates migration input for Oracle to Azure Database
+ * for PostgreSQL for online migrations.
+ */
+public class ValidateOracleAzureDbPostgreSqlSyncTaskOutput {
+    /**
+     * Errors associated with a selected database object.
+     */
+    @JsonProperty(value = "validationErrors", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ReportableException> validationErrors;
+
+    /**
+     * Get errors associated with a selected database object.
+     *
+     * @return the validationErrors value
+     */
+    public List<ReportableException> validationErrors() {
+        return this.validationErrors;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/CommandPropertiesInner.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/CommandPropertiesInner.java
index 71ab2f86e7bd..b39916cba817 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/CommandPropertiesInner.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/CommandPropertiesInner.java
@@ -10,70 +10,55 @@
 
 import java.util.List;
 
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToMongoDbTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToSourceMySqlTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToSourceSqlServerSyncTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToSourceSqlServerTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToTargetAzureDbForMySqlTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToTargetSqlDbTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToTargetSqlMITaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ConnectToTargetSqlSqlDbSyncTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.GetTdeCertificatesSqlTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.GetUserTablesSqlSyncTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.GetUserTablesSqlTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigrateMongoDbTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigrateMySqlAzureDbForMySqlSyncTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigrateSchemaSqlServerSqlDbTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigrateSqlServerSqlDbSyncTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigrateSqlServerSqlDbTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigrateSqlServerSqlMITaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MigrateSyncCompleteCommandProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MongoDbCancelCommand;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MongoDbConnectionInfo;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MongoDbFinishCommand;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MongoDbRestartCommand;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.MySqlConnectionInfo;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ODataError;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.CommandState;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.PostgreSqlConnectionInfo;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.SqlConnectionInfo;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ValidateMigrationInputSqlServerSqlDbSyncTaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ValidateMigrationInputSqlServerSqlMITaskProperties;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ValidateMongoDbTaskProperties;
 
 /**
  * Base class for all types of DMS command properties. If command is not
  * supported by current client, this object is returned.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "commandType", defaultImpl = CommandPropertiesInner.class)
 @JsonTypeName("Unknown")
 @JsonSubTypes({
+    @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureDbSqlMi.Complete", value = MigrateMISyncCompleteCommandProperties.class),
     @JsonSubTypes.Type(name = "Migrate.Sync.Complete.Database", value = MigrateSyncCompleteCommandProperties.class),
+    @JsonSubTypes.Type(name = "MiSqlConnectionInfo", value = MiSqlConnectionInfo.class),
     @JsonSubTypes.Type(name = "PostgreSqlConnectionInfo", value = PostgreSqlConnectionInfo.class),
+    @JsonSubTypes.Type(name = "OracleConnectionInfo", value = OracleConnectionInfo.class),
     @JsonSubTypes.Type(name = "MySqlConnectionInfo", value = MySqlConnectionInfo.class),
     @JsonSubTypes.Type(name = "MongoDbConnectionInfo", value = MongoDbConnectionInfo.class),
     @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class),
+    @JsonSubTypes.Type(name = "Migrate.Ssis", value = MigrateSsisTaskProperties.class),
     @JsonSubTypes.Type(name = "GetTDECertificates.Sql", value = GetTdeCertificatesSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "Validate.Oracle.AzureDbPostgreSql.Sync", value = ValidateOracleAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Validate.MongoDb", value = ValidateMongoDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI.Sync.LRS", value = ValidateMigrationInputSqlServerSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI", value = ValidateMigrationInputSqlServerSqlMITaskProperties.class),
     @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.SqlDb.Sync", value = ValidateMigrationInputSqlServerSqlDbSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "Migrate.Oracle.AzureDbForPostgreSql.Sync", value = MigrateOracleAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.PostgreSql.AzureDbForPostgreSql.Sync", value = MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.MySql.AzureDbForMySql.Sync", value = MigrateMySqlAzureDbForMySqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDb.Sync", value = MigrateSqlServerSqlDbSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.SqlDb", value = MigrateSqlServerSqlDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI.Sync.LRS", value = MigrateSqlServerSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI", value = MigrateSqlServerSqlMITaskProperties.class),
     @JsonSubTypes.Type(name = "Migrate.MongoDb", value = MigrateMongoDbTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.AzureDbForMySql", value = ConnectToTargetAzureDbForMySqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.AzureSqlDbMI.Sync.LRS", value = ConnectToTargetSqlMISyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.AzureSqlDbMI", value = ConnectToTargetSqlMITaskProperties.class),
+    @JsonSubTypes.Type(name = "GetUserTablesPostgreSql", value = GetUserTablesPostgreSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "GetUserTablesOracle", value = GetUserTablesOracleTaskProperties.class),
     @JsonSubTypes.Type(name = "GetUserTables.AzureSqlDb.Sync", value = GetUserTablesSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "GetUserTables.Sql", value = GetUserTablesSqlTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.Oracle.AzureDbForPostgreSql.Sync", value = ConnectToTargetOracleAzureDbForPostgreSqlSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToTarget.AzureDbForPostgreSql.Sync", value = ConnectToTargetAzureDbForPostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb.Sync", value = ConnectToTargetSqlSqlDbSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb", value = ConnectToTargetSqlDbTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToSource.Oracle.Sync", value = ConnectToSourceOracleSyncTaskProperties.class),
+    @JsonSubTypes.Type(name = "ConnectToSource.PostgreSql.Sync", value = ConnectToSourcePostgreSqlSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToSource.SqlServer.Sync", value = ConnectToSourceSqlServerSyncTaskProperties.class),
     @JsonSubTypes.Type(name = "ConnectToSource.SqlServer", value = ConnectToSourceSqlServerTaskProperties.class),
     @JsonSubTypes.Type(name = "Connect.MongoDb", value = ConnectToMongoDbTaskProperties.class),
@@ -81,7 +66,10 @@
     @JsonSubTypes.Type(name = "MigrateSchemaSqlServerSqlDb", value = MigrateSchemaSqlServerSqlDbTaskProperties.class),
     @JsonSubTypes.Type(name = "cancel", value = MongoDbCancelCommand.class),
     @JsonSubTypes.Type(name = "finish", value = MongoDbFinishCommand.class),
-    @JsonSubTypes.Type(name = "restart", value = MongoDbRestartCommand.class)
+    @JsonSubTypes.Type(name = "restart", value = MongoDbRestartCommand.class),
+    @JsonSubTypes.Type(name = "Service.Check.OCI", value = CheckOCIDriverTaskProperties.class),
+    @JsonSubTypes.Type(name = "Service.Upload.OCI", value = UploadOCIDriverTaskProperties.class),
+    @JsonSubTypes.Type(name = "Service.Install.OCI", value = InstallOCIDriverTaskProperties.class)
 })
 public class CommandPropertiesInner {
     /**
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationManager.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationManager.java
index c1e423b37cfd..8c02f0d61656 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationManager.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationManager.java
@@ -19,6 +19,7 @@
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ResourceSkus;
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.Services;
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.Tasks;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceTasks;
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.Projects;
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.Usages;
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.Operations;
@@ -33,6 +34,7 @@ public final class DataMigrationManager extends ManagerCore<DataMigrationManager
     private ResourceSkus resourceSkus;
     private Services services;
     private Tasks tasks;
+    private ServiceTasks serviceTasks;
     private Projects projects;
     private Usages usages;
     private Operations operations;
@@ -114,6 +116,16 @@ public Tasks tasks() {
         return this.tasks;
     }
 
+    /**
+     * @return Entry point to manage ServiceTasks.
+     */
+    public ServiceTasks serviceTasks() {
+        if (this.serviceTasks == null) {
+            this.serviceTasks = new ServiceTasksImpl(this);
+        }
+        return this.serviceTasks;
+    }
+
     /**
      * @return Entry point to manage Projects.
      */
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationServiceClientImpl.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationServiceClientImpl.java
index 8081cc400b51..ad693e5e42ae 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationServiceClientImpl.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/DataMigrationServiceClientImpl.java
@@ -171,6 +171,19 @@ public TasksInner tasks() {
         return this.tasks;
     }
 
+    /**
+     * The ServiceTasksInner object to access its operations.
+     */
+    private ServiceTasksInner serviceTasks;
+
+    /**
+     * Gets the ServiceTasksInner object to access its operations.
+     * @return the ServiceTasksInner object.
+     */
+    public ServiceTasksInner serviceTasks() {
+        return this.serviceTasks;
+    }
+
     /**
      * The ProjectsInner object to access its operations.
      */
@@ -261,6 +274,7 @@ protected void initialize() {
         this.resourceSkus = new ResourceSkusInner(restClient().retrofit(), this);
         this.services = new ServicesInner(restClient().retrofit(), this);
         this.tasks = new TasksInner(restClient().retrofit(), this);
+        this.serviceTasks = new ServiceTasksInner(restClient().retrofit(), this);
         this.projects = new ProjectsInner(restClient().retrofit(), this);
         this.usages = new UsagesInner(restClient().retrofit(), this);
         this.operations = new OperationsInner(restClient().retrofit(), this);
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/FilesImpl.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/FilesImpl.java
index 9fd6030c0590..76b9fb6a8fe8 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/FilesImpl.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/FilesImpl.java
@@ -89,10 +89,14 @@ public ProjectFile call(ProjectFileInner inner) {
     public Observable<ProjectFile> getAsync(String groupName, String serviceName, String projectName, String fileName) {
         FilesInner client = this.inner();
         return client.getAsync(groupName, serviceName, projectName, fileName)
-        .map(new Func1<ProjectFileInner, ProjectFile>() {
+        .flatMap(new Func1<ProjectFileInner, Observable<ProjectFile>>() {
             @Override
-            public ProjectFile call(ProjectFileInner inner) {
-                return wrapModel(inner);
+            public Observable<ProjectFile> call(ProjectFileInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ProjectFile)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectTaskImpl.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectServiceProjectTaskImpl.java
similarity index 78%
rename from datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectTaskImpl.java
rename to datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectServiceProjectTaskImpl.java
index 0d278f258194..d624642e5298 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectTaskImpl.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectServiceProjectTaskImpl.java
@@ -8,19 +8,19 @@
 
 package com.microsoft.azure.management.datamigration.v2018_07_15_preview.implementation;
 
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ProjectTask;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ProjectServiceProjectTask;
 import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
 import rx.Observable;
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ProjectTaskProperties;
 
-class ProjectTaskImpl extends CreatableUpdatableImpl<ProjectTask, ProjectTaskInner, ProjectTaskImpl> implements ProjectTask, ProjectTask.Definition, ProjectTask.Update {
+class ProjectServiceProjectTaskImpl extends CreatableUpdatableImpl<ProjectServiceProjectTask, ProjectTaskInner, ProjectServiceProjectTaskImpl> implements ProjectServiceProjectTask, ProjectServiceProjectTask.Definition, ProjectServiceProjectTask.Update {
     private final DataMigrationManager manager;
     private String groupName;
     private String serviceName;
     private String projectName;
     private String taskName;
 
-    ProjectTaskImpl(String name, DataMigrationManager manager) {
+    ProjectServiceProjectTaskImpl(String name, DataMigrationManager manager) {
         super(name, new ProjectTaskInner());
         this.manager = manager;
         // Set resource name
@@ -28,7 +28,7 @@ class ProjectTaskImpl extends CreatableUpdatableImpl<ProjectTask, ProjectTaskInn
         //
     }
 
-    ProjectTaskImpl(ProjectTaskInner inner, DataMigrationManager manager) {
+    ProjectServiceProjectTaskImpl(ProjectTaskInner inner, DataMigrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -47,14 +47,14 @@ public DataMigrationManager manager() {
     }
 
     @Override
-    public Observable<ProjectTask> createResourceAsync() {
+    public Observable<ProjectServiceProjectTask> createResourceAsync() {
         TasksInner client = this.manager().inner().tasks();
         return client.createOrUpdateAsync(this.groupName, this.serviceName, this.projectName, this.taskName, this.inner())
             .map(innerToFluentMap(this));
     }
 
     @Override
-    public Observable<ProjectTask> updateResourceAsync() {
+    public Observable<ProjectServiceProjectTask> updateResourceAsync() {
         TasksInner client = this.manager().inner().tasks();
         return client.updateAsync(this.groupName, this.serviceName, this.projectName, this.taskName, this.inner())
             .map(innerToFluentMap(this));
@@ -98,7 +98,7 @@ public String type() {
     }
 
     @Override
-    public ProjectTaskImpl withExistingProject(String groupName, String serviceName, String projectName) {
+    public ProjectServiceProjectTaskImpl withExistingProject(String groupName, String serviceName, String projectName) {
         this.groupName = groupName;
         this.serviceName = serviceName;
         this.projectName = projectName;
@@ -106,13 +106,13 @@ public ProjectTaskImpl withExistingProject(String groupName, String serviceName,
     }
 
     @Override
-    public ProjectTaskImpl withEtag(String etag) {
+    public ProjectServiceProjectTaskImpl withEtag(String etag) {
         this.inner().withEtag(etag);
         return this;
     }
 
     @Override
-    public ProjectTaskImpl withProperties(ProjectTaskProperties properties) {
+    public ProjectServiceProjectTaskImpl withProperties(ProjectTaskProperties properties) {
         this.inner().withProperties(properties);
         return this;
     }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectsImpl.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectsImpl.java
index 8be299863e03..e9325ce2ec2a 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectsImpl.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ProjectsImpl.java
@@ -64,10 +64,14 @@ public Project call(ProjectInner inner) {
     public Observable<Project> getAsync(String groupName, String serviceName, String projectName) {
         ProjectsInner client = this.inner();
         return client.getAsync(groupName, serviceName, projectName)
-        .map(new Func1<ProjectInner, Project>() {
+        .flatMap(new Func1<ProjectInner, Observable<Project>>() {
             @Override
-            public Project call(ProjectInner inner) {
-                return wrapModel(inner);
+            public Observable<Project> call(ProjectInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Project)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceProjectTaskImpl.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceProjectTaskImpl.java
new file mode 100644
index 000000000000..2f5a6fa7a482
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceProjectTaskImpl.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datamigration.v2018_07_15_preview.implementation;
+
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceProjectTask;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ProjectTaskProperties;
+
+class ServiceProjectTaskImpl extends CreatableUpdatableImpl<ServiceProjectTask, ProjectTaskInner, ServiceProjectTaskImpl> implements ServiceProjectTask, ServiceProjectTask.Definition, ServiceProjectTask.Update {
+    private final DataMigrationManager manager;
+    private String groupName;
+    private String serviceName;
+    private String taskName;
+
+    ServiceProjectTaskImpl(String name, DataMigrationManager manager) {
+        super(name, new ProjectTaskInner());
+        this.manager = manager;
+        // Set resource name
+        this.taskName = name;
+        //
+    }
+
+    ServiceProjectTaskImpl(ProjectTaskInner inner, DataMigrationManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.taskName = inner.name();
+        // set resource ancestor and positional variables
+        this.groupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.serviceName = IdParsingUtils.getValueFromIdByName(inner.id(), "services");
+        this.taskName = IdParsingUtils.getValueFromIdByName(inner.id(), "serviceTasks");
+        //
+    }
+
+    @Override
+    public DataMigrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ServiceProjectTask> createResourceAsync() {
+        ServiceTasksInner client = this.manager().inner().serviceTasks();
+        return client.createOrUpdateAsync(this.groupName, this.serviceName, this.taskName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ServiceProjectTask> updateResourceAsync() {
+        ServiceTasksInner client = this.manager().inner().serviceTasks();
+        return client.updateAsync(this.groupName, this.serviceName, this.taskName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ProjectTaskInner> getInnerAsync() {
+        ServiceTasksInner client = this.manager().inner().serviceTasks();
+        return client.getAsync(this.groupName, this.serviceName, this.taskName);
+    }
+
+    @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 ProjectTaskProperties properties() {
+        return this.inner().properties();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ServiceProjectTaskImpl withExistingService(String groupName, String serviceName) {
+        this.groupName = groupName;
+        this.serviceName = serviceName;
+        return this;
+    }
+
+    @Override
+    public ServiceProjectTaskImpl withEtag(String etag) {
+        this.inner().withEtag(etag);
+        return this;
+    }
+
+    @Override
+    public ServiceProjectTaskImpl withProperties(ProjectTaskProperties properties) {
+        this.inner().withProperties(properties);
+        return this;
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksImpl.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksImpl.java
new file mode 100644
index 000000000000..f0d889408fa8
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksImpl.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.datamigration.v2018_07_15_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceTasks;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ProjectServiceProjectTask;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceProjectTask;
+
+class ServiceTasksImpl extends WrapperImpl<ServiceTasksInner> implements ServiceTasks {
+    private final DataMigrationManager manager;
+
+    ServiceTasksImpl(DataMigrationManager manager) {
+        super(manager.inner().serviceTasks());
+        this.manager = manager;
+    }
+
+    public DataMigrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ServiceProjectTaskImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ServiceProjectTaskImpl wrapModel(ProjectTaskInner inner) {
+        return  new ServiceProjectTaskImpl(inner, manager());
+    }
+
+    private ServiceProjectTaskImpl wrapModel(String name) {
+        return new ServiceProjectTaskImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ProjectServiceProjectTask> cancelAsync(String groupName, String serviceName, String taskName) {
+        ServiceTasksInner client = this.inner();
+        return client.cancelAsync(groupName, serviceName, taskName)
+        .map(new Func1<ProjectTaskInner, ProjectServiceProjectTask>() {
+            @Override
+            public ProjectServiceProjectTask call(ProjectTaskInner inner) {
+                return new ProjectServiceProjectTaskImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ServiceProjectTask> listAsync(final String groupName, final String serviceName) {
+        ServiceTasksInner client = this.inner();
+        return client.listAsync(groupName, serviceName)
+        .flatMapIterable(new Func1<Page<ProjectTaskInner>, Iterable<ProjectTaskInner>>() {
+            @Override
+            public Iterable<ProjectTaskInner> call(Page<ProjectTaskInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ProjectTaskInner, ServiceProjectTask>() {
+            @Override
+            public ServiceProjectTask call(ProjectTaskInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ServiceProjectTask> getAsync(String groupName, String serviceName, String taskName) {
+        ServiceTasksInner client = this.inner();
+        return client.getAsync(groupName, serviceName, taskName)
+        .flatMap(new Func1<ProjectTaskInner, Observable<ServiceProjectTask>>() {
+            @Override
+            public Observable<ServiceProjectTask> call(ProjectTaskInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ServiceProjectTask)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String groupName, String serviceName, String taskName) {
+        ServiceTasksInner client = this.inner();
+        return client.deleteAsync(groupName, serviceName, taskName).toCompletable();
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksInner.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksInner.java
new file mode 100644
index 000000000000..d9f66f1792a8
--- /dev/null
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/ServiceTasksInner.java
@@ -0,0 +1,1158 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datamigration.v2018_07_15_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ApiErrorException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ServiceTasks.
+ */
+public class ServiceTasksInner {
+    /** The Retrofit service to perform REST calls. */
+    private ServiceTasksService service;
+    /** The service client containing this operation class. */
+    private DataMigrationServiceClientImpl client;
+
+    /**
+     * Initializes an instance of ServiceTasksInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ServiceTasksInner(Retrofit retrofit, DataMigrationServiceClientImpl client) {
+        this.service = retrofit.create(ServiceTasksService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ServiceTasks to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ServiceTasksService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceTasks list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/serviceTasks")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Path("groupName") String groupName, @Path("serviceName") String serviceName, @Query("api-version") String apiVersion, @Query("taskType") String taskType, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceTasks createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/serviceTasks/{taskName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("groupName") String groupName, @Path("serviceName") String serviceName, @Path("taskName") String taskName, @Body ProjectTaskInner 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.datamigration.v2018_07_15_preview.ServiceTasks get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/serviceTasks/{taskName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("groupName") String groupName, @Path("serviceName") String serviceName, @Path("taskName") String taskName, @Query("$expand") String expand, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceTasks delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/serviceTasks/{taskName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("groupName") String groupName, @Path("serviceName") String serviceName, @Path("taskName") String taskName, @Query("deleteRunningTasks") Boolean deleteRunningTasks, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceTasks update" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/serviceTasks/{taskName}")
+        Observable<Response<ResponseBody>> update(@Path("subscriptionId") String subscriptionId, @Path("groupName") String groupName, @Path("serviceName") String serviceName, @Path("taskName") String taskName, @Body ProjectTaskInner 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.datamigration.v2018_07_15_preview.ServiceTasks cancel" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.DataMigration/services/{serviceName}/serviceTasks/{taskName}/cancel")
+        Observable<Response<ResponseBody>> cancel(@Path("subscriptionId") String subscriptionId, @Path("groupName") String groupName, @Path("serviceName") String serviceName, @Path("taskName") String taskName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.datamigration.v2018_07_15_preview.ServiceTasks listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ProjectTaskInner&gt; object if successful.
+     */
+    public PagedList<ProjectTaskInner> list(final String groupName, final String serviceName) {
+        ServiceResponse<Page<ProjectTaskInner>> response = listSinglePageAsync(groupName, serviceName).toBlocking().single();
+        return new PagedList<ProjectTaskInner>(response.body()) {
+            @Override
+            public Page<ProjectTaskInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the 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<ProjectTaskInner>> listAsync(final String groupName, final String serviceName, final ListOperationCallback<ProjectTaskInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(groupName, serviceName),
+            new Func1<String, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProjectTaskInner&gt; object
+     */
+    public Observable<Page<ProjectTaskInner>> listAsync(final String groupName, final String serviceName) {
+        return listWithServiceResponseAsync(groupName, serviceName)
+            .map(new Func1<ServiceResponse<Page<ProjectTaskInner>>, Page<ProjectTaskInner>>() {
+                @Override
+                public Page<ProjectTaskInner> call(ServiceResponse<Page<ProjectTaskInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProjectTaskInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ProjectTaskInner>>> listWithServiceResponseAsync(final String groupName, final String serviceName) {
+        return listSinglePageAsync(groupName, serviceName)
+            .concatMap(new Func1<ServiceResponse<Page<ProjectTaskInner>>, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(ServiceResponse<Page<ProjectTaskInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ProjectTaskInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ProjectTaskInner>>> listSinglePageAsync(final String groupName, final String serviceName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName 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 taskType = null;
+        return service.list(this.client.subscriptionId(), groupName, serviceName, this.client.apiVersion(), taskType, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ProjectTaskInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ProjectTaskInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskType Filter tasks by task type
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ProjectTaskInner&gt; object if successful.
+     */
+    public PagedList<ProjectTaskInner> list(final String groupName, final String serviceName, final String taskType) {
+        ServiceResponse<Page<ProjectTaskInner>> response = listSinglePageAsync(groupName, serviceName, taskType).toBlocking().single();
+        return new PagedList<ProjectTaskInner>(response.body()) {
+            @Override
+            public Page<ProjectTaskInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskType Filter tasks by task type
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ProjectTaskInner>> listAsync(final String groupName, final String serviceName, final String taskType, final ListOperationCallback<ProjectTaskInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(groupName, serviceName, taskType),
+            new Func1<String, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskType Filter tasks by task type
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProjectTaskInner&gt; object
+     */
+    public Observable<Page<ProjectTaskInner>> listAsync(final String groupName, final String serviceName, final String taskType) {
+        return listWithServiceResponseAsync(groupName, serviceName, taskType)
+            .map(new Func1<ServiceResponse<Page<ProjectTaskInner>>, Page<ProjectTaskInner>>() {
+                @Override
+                public Page<ProjectTaskInner> call(ServiceResponse<Page<ProjectTaskInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskType Filter tasks by task type
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProjectTaskInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ProjectTaskInner>>> listWithServiceResponseAsync(final String groupName, final String serviceName, final String taskType) {
+        return listSinglePageAsync(groupName, serviceName, taskType)
+            .concatMap(new Func1<ServiceResponse<Page<ProjectTaskInner>>, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(ServiceResponse<Page<ProjectTaskInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+    ServiceResponse<PageImpl<ProjectTaskInner>> * @param groupName Name of the resource group
+    ServiceResponse<PageImpl<ProjectTaskInner>> * @param serviceName Name of the service
+    ServiceResponse<PageImpl<ProjectTaskInner>> * @param taskType Filter tasks by task type
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ProjectTaskInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ProjectTaskInner>>> listSinglePageAsync(final String groupName, final String serviceName, final String taskType) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.list(this.client.subscriptionId(), groupName, serviceName, this.client.apiVersion(), taskType, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ProjectTaskInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ProjectTaskInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ProjectTaskInner>> listDelegate(Response<ResponseBody> response) throws ApiErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ProjectTaskInner>, ApiErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ProjectTaskInner>>() { }.getType())
+                .registerError(ApiErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PUT method creates a new service task or updates an existing one, although since service tasks have no mutable custom properties, there is little reason to update an existing one.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ProjectTaskInner object if successful.
+     */
+    public ProjectTaskInner createOrUpdate(String groupName, String serviceName, String taskName, ProjectTaskInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(groupName, serviceName, taskName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PUT method creates a new service task or updates an existing one, although since service tasks have no mutable custom properties, there is little reason to update an existing one.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ProjectTaskInner> createOrUpdateAsync(String groupName, String serviceName, String taskName, ProjectTaskInner parameters, final ServiceCallback<ProjectTaskInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(groupName, serviceName, taskName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PUT method creates a new service task or updates an existing one, although since service tasks have no mutable custom properties, there is little reason to update an existing one.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ProjectTaskInner> createOrUpdateAsync(String groupName, String serviceName, String taskName, ProjectTaskInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(groupName, serviceName, taskName, parameters).map(new Func1<ServiceResponse<ProjectTaskInner>, ProjectTaskInner>() {
+            @Override
+            public ProjectTaskInner call(ServiceResponse<ProjectTaskInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PUT method creates a new service task or updates an existing one, although since service tasks have no mutable custom properties, there is little reason to update an existing one.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ServiceResponse<ProjectTaskInner>> createOrUpdateWithServiceResponseAsync(String groupName, String serviceName, String taskName, ProjectTaskInner parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (taskName == null) {
+            throw new IllegalArgumentException("Parameter taskName is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdate(this.client.subscriptionId(), groupName, serviceName, taskName, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ProjectTaskInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ProjectTaskInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ProjectTaskInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ProjectTaskInner> createOrUpdateDelegate(Response<ResponseBody> response) throws ApiErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ProjectTaskInner, ApiErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ProjectTaskInner>() { }.getType())
+                .register(201, new TypeToken<ProjectTaskInner>() { }.getType())
+                .registerError(ApiErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ProjectTaskInner object if successful.
+     */
+    public ProjectTaskInner get(String groupName, String serviceName, String taskName) {
+        return getWithServiceResponseAsync(groupName, serviceName, taskName).toBlocking().single().body();
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ProjectTaskInner> getAsync(String groupName, String serviceName, String taskName, final ServiceCallback<ProjectTaskInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(groupName, serviceName, taskName), serviceCallback);
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ProjectTaskInner> getAsync(String groupName, String serviceName, String taskName) {
+        return getWithServiceResponseAsync(groupName, serviceName, taskName).map(new Func1<ServiceResponse<ProjectTaskInner>, ProjectTaskInner>() {
+            @Override
+            public ProjectTaskInner call(ServiceResponse<ProjectTaskInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ServiceResponse<ProjectTaskInner>> getWithServiceResponseAsync(String groupName, String serviceName, String taskName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (taskName == null) {
+            throw new IllegalArgumentException("Parameter taskName 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 expand = null;
+        return service.get(this.client.subscriptionId(), groupName, serviceName, taskName, expand, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ProjectTaskInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ProjectTaskInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ProjectTaskInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param expand Expand the response
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ProjectTaskInner object if successful.
+     */
+    public ProjectTaskInner get(String groupName, String serviceName, String taskName, String expand) {
+        return getWithServiceResponseAsync(groupName, serviceName, taskName, expand).toBlocking().single().body();
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param expand Expand the response
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ProjectTaskInner> getAsync(String groupName, String serviceName, String taskName, String expand, final ServiceCallback<ProjectTaskInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(groupName, serviceName, taskName, expand), serviceCallback);
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param expand Expand the response
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ProjectTaskInner> getAsync(String groupName, String serviceName, String taskName, String expand) {
+        return getWithServiceResponseAsync(groupName, serviceName, taskName, expand).map(new Func1<ServiceResponse<ProjectTaskInner>, ProjectTaskInner>() {
+            @Override
+            public ProjectTaskInner call(ServiceResponse<ProjectTaskInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get service task information.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The GET method retrieves information about a service task.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param expand Expand the response
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ServiceResponse<ProjectTaskInner>> getWithServiceResponseAsync(String groupName, String serviceName, String taskName, String expand) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (taskName == null) {
+            throw new IllegalArgumentException("Parameter taskName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(this.client.subscriptionId(), groupName, serviceName, taskName, expand, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ProjectTaskInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ProjectTaskInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ProjectTaskInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ProjectTaskInner> getDelegate(Response<ResponseBody> response) throws ApiErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ProjectTaskInner, ApiErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ProjectTaskInner>() { }.getType())
+                .registerError(ApiErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException 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 groupName, String serviceName, String taskName) {
+        deleteWithServiceResponseAsync(groupName, serviceName, taskName).toBlocking().single().body();
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param serviceCallback 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 groupName, String serviceName, String taskName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(groupName, serviceName, taskName), serviceCallback);
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String groupName, String serviceName, String taskName) {
+        return deleteWithServiceResponseAsync(groupName, serviceName, taskName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String groupName, String serviceName, String taskName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (taskName == null) {
+            throw new IllegalArgumentException("Parameter taskName 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 Boolean deleteRunningTasks = null;
+        return service.delete(this.client.subscriptionId(), groupName, serviceName, taskName, deleteRunningTasks, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param deleteRunningTasks Delete the resource even if it contains running tasks
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException 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 groupName, String serviceName, String taskName, Boolean deleteRunningTasks) {
+        deleteWithServiceResponseAsync(groupName, serviceName, taskName, deleteRunningTasks).toBlocking().single().body();
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param deleteRunningTasks Delete the resource even if it contains running tasks
+     * @param serviceCallback 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 groupName, String serviceName, String taskName, Boolean deleteRunningTasks, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(groupName, serviceName, taskName, deleteRunningTasks), serviceCallback);
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param deleteRunningTasks Delete the resource even if it contains running tasks
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String groupName, String serviceName, String taskName, Boolean deleteRunningTasks) {
+        return deleteWithServiceResponseAsync(groupName, serviceName, taskName, deleteRunningTasks).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The DELETE method deletes a service task, canceling it first if it's running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param deleteRunningTasks Delete the resource even if it contains running tasks
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String groupName, String serviceName, String taskName, Boolean deleteRunningTasks) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (taskName == null) {
+            throw new IllegalArgumentException("Parameter taskName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.delete(this.client.subscriptionId(), groupName, serviceName, taskName, deleteRunningTasks, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws ApiErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ApiErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ApiErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PATCH method updates an existing service task, but since service tasks have no mutable custom properties, there is little reason to do so.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ProjectTaskInner object if successful.
+     */
+    public ProjectTaskInner update(String groupName, String serviceName, String taskName, ProjectTaskInner parameters) {
+        return updateWithServiceResponseAsync(groupName, serviceName, taskName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PATCH method updates an existing service task, but since service tasks have no mutable custom properties, there is little reason to do so.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ProjectTaskInner> updateAsync(String groupName, String serviceName, String taskName, ProjectTaskInner parameters, final ServiceCallback<ProjectTaskInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateWithServiceResponseAsync(groupName, serviceName, taskName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PATCH method updates an existing service task, but since service tasks have no mutable custom properties, there is little reason to do so.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ProjectTaskInner> updateAsync(String groupName, String serviceName, String taskName, ProjectTaskInner parameters) {
+        return updateWithServiceResponseAsync(groupName, serviceName, taskName, parameters).map(new Func1<ServiceResponse<ProjectTaskInner>, ProjectTaskInner>() {
+            @Override
+            public ProjectTaskInner call(ServiceResponse<ProjectTaskInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or update service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. The PATCH method updates an existing service task, but since service tasks have no mutable custom properties, there is little reason to do so.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param parameters Information about the task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ServiceResponse<ProjectTaskInner>> updateWithServiceResponseAsync(String groupName, String serviceName, String taskName, ProjectTaskInner parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (taskName == null) {
+            throw new IllegalArgumentException("Parameter taskName is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.update(this.client.subscriptionId(), groupName, serviceName, taskName, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ProjectTaskInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ProjectTaskInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ProjectTaskInner> clientResponse = updateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ProjectTaskInner> updateDelegate(Response<ResponseBody> response) throws ApiErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ProjectTaskInner, ApiErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ProjectTaskInner>() { }.getType())
+                .registerError(ApiErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Cancel a service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. This method cancels a service task if it's currently queued or running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ProjectTaskInner object if successful.
+     */
+    public ProjectTaskInner cancel(String groupName, String serviceName, String taskName) {
+        return cancelWithServiceResponseAsync(groupName, serviceName, taskName).toBlocking().single().body();
+    }
+
+    /**
+     * Cancel a service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. This method cancels a service task if it's currently queued or running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<ProjectTaskInner> cancelAsync(String groupName, String serviceName, String taskName, final ServiceCallback<ProjectTaskInner> serviceCallback) {
+        return ServiceFuture.fromResponse(cancelWithServiceResponseAsync(groupName, serviceName, taskName), serviceCallback);
+    }
+
+    /**
+     * Cancel a service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. This method cancels a service task if it's currently queued or running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ProjectTaskInner> cancelAsync(String groupName, String serviceName, String taskName) {
+        return cancelWithServiceResponseAsync(groupName, serviceName, taskName).map(new Func1<ServiceResponse<ProjectTaskInner>, ProjectTaskInner>() {
+            @Override
+            public ProjectTaskInner call(ServiceResponse<ProjectTaskInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Cancel a service task.
+     * The service tasks resource is a nested, proxy-only resource representing work performed by a DMS instance. This method cancels a service task if it's currently queued or running.
+     *
+     * @param groupName Name of the resource group
+     * @param serviceName Name of the service
+     * @param taskName Name of the Task
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ProjectTaskInner object
+     */
+    public Observable<ServiceResponse<ProjectTaskInner>> cancelWithServiceResponseAsync(String groupName, String serviceName, String taskName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (groupName == null) {
+            throw new IllegalArgumentException("Parameter groupName is required and cannot be null.");
+        }
+        if (serviceName == null) {
+            throw new IllegalArgumentException("Parameter serviceName is required and cannot be null.");
+        }
+        if (taskName == null) {
+            throw new IllegalArgumentException("Parameter taskName 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(this.client.subscriptionId(), groupName, serviceName, taskName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ProjectTaskInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ProjectTaskInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ProjectTaskInner> clientResponse = cancelDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ProjectTaskInner> cancelDelegate(Response<ResponseBody> response) throws ApiErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ProjectTaskInner, ApiErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ProjectTaskInner>() { }.getType())
+                .registerError(ApiErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ApiErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ProjectTaskInner&gt; object if successful.
+     */
+    public PagedList<ProjectTaskInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ProjectTaskInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ProjectTaskInner>(response.body()) {
+            @Override
+            public Page<ProjectTaskInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @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<ProjectTaskInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ProjectTaskInner>> serviceFuture, final ListOperationCallback<ProjectTaskInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProjectTaskInner&gt; object
+     */
+    public Observable<Page<ProjectTaskInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ProjectTaskInner>>, Page<ProjectTaskInner>>() {
+                @Override
+                public Page<ProjectTaskInner> call(ServiceResponse<Page<ProjectTaskInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ProjectTaskInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ProjectTaskInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ProjectTaskInner>>, Observable<ServiceResponse<Page<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(ServiceResponse<Page<ProjectTaskInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get service level tasks for a service.
+     * The services resource is the top-level resource that represents the Database Migration Service. This method returns a list of service level tasks owned by a service resource. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
+     *
+    ServiceResponse<PageImpl<ProjectTaskInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ProjectTaskInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ProjectTaskInner>>> 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<ProjectTaskInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ProjectTaskInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ProjectTaskInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ProjectTaskInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ProjectTaskInner>> listNextDelegate(Response<ResponseBody> response) throws ApiErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ProjectTaskInner>, ApiErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ProjectTaskInner>>() { }.getType())
+                .registerError(ApiErrorException.class)
+                .build(response);
+    }
+
+}
diff --git a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/TasksImpl.java b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/TasksImpl.java
index 5e670292589f..a44716265c2e 100644
--- a/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/TasksImpl.java
+++ b/datamigration/resource-manager/v2018_07_15_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_07_15_preview/implementation/TasksImpl.java
@@ -15,7 +15,7 @@
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.Page;
-import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ProjectTask;
+import com.microsoft.azure.management.datamigration.v2018_07_15_preview.ProjectServiceProjectTask;
 import com.microsoft.azure.management.datamigration.v2018_07_15_preview.CommandProperties;
 
 class TasksImpl extends WrapperImpl<TasksInner> implements Tasks {
@@ -31,26 +31,26 @@ public DataMigrationManager manager() {
     }
 
     @Override
-    public ProjectTaskImpl define(String name) {
+    public ProjectServiceProjectTaskImpl define(String name) {
         return wrapModel(name);
     }
 
-    private ProjectTaskImpl wrapModel(ProjectTaskInner inner) {
-        return  new ProjectTaskImpl(inner, manager());
+    private ProjectServiceProjectTaskImpl wrapModel(ProjectTaskInner inner) {
+        return  new ProjectServiceProjectTaskImpl(inner, manager());
     }
 
-    private ProjectTaskImpl wrapModel(String name) {
-        return new ProjectTaskImpl(name, this.manager());
+    private ProjectServiceProjectTaskImpl wrapModel(String name) {
+        return new ProjectServiceProjectTaskImpl(name, this.manager());
     }
 
     @Override
-    public Observable<ProjectTask> cancelAsync(String groupName, String serviceName, String projectName, String taskName) {
+    public Observable<ProjectServiceProjectTask> cancelAsync(String groupName, String serviceName, String projectName, String taskName) {
         TasksInner client = this.inner();
         return client.cancelAsync(groupName, serviceName, projectName, taskName)
-        .map(new Func1<ProjectTaskInner, ProjectTask>() {
+        .map(new Func1<ProjectTaskInner, ProjectServiceProjectTask>() {
             @Override
-            public ProjectTask call(ProjectTaskInner inner) {
-                return new ProjectTaskImpl(inner, manager());
+            public ProjectServiceProjectTask call(ProjectTaskInner inner) {
+                return new ProjectServiceProjectTaskImpl(inner, manager());
             }
         });
     }
@@ -68,7 +68,7 @@ public CommandProperties call(CommandPropertiesInner inner) {
     }
 
     @Override
-    public Observable<ProjectTask> listAsync(final String groupName, final String serviceName, final String projectName) {
+    public Observable<ProjectServiceProjectTask> listAsync(final String groupName, final String serviceName, final String projectName) {
         TasksInner client = this.inner();
         return client.listAsync(groupName, serviceName, projectName)
         .flatMapIterable(new Func1<Page<ProjectTaskInner>, Iterable<ProjectTaskInner>>() {
@@ -77,22 +77,26 @@ public Iterable<ProjectTaskInner> call(Page<ProjectTaskInner> page) {
                 return page.items();
             }
         })
-        .map(new Func1<ProjectTaskInner, ProjectTask>() {
+        .map(new Func1<ProjectTaskInner, ProjectServiceProjectTask>() {
             @Override
-            public ProjectTask call(ProjectTaskInner inner) {
+            public ProjectServiceProjectTask call(ProjectTaskInner inner) {
                 return wrapModel(inner);
             }
         });
     }
 
     @Override
-    public Observable<ProjectTask> getAsync(String groupName, String serviceName, String projectName, String taskName) {
+    public Observable<ProjectServiceProjectTask> getAsync(String groupName, String serviceName, String projectName, String taskName) {
         TasksInner client = this.inner();
         return client.getAsync(groupName, serviceName, projectName, taskName)
-        .map(new Func1<ProjectTaskInner, ProjectTask>() {
+        .flatMap(new Func1<ProjectTaskInner, Observable<ProjectServiceProjectTask>>() {
             @Override
-            public ProjectTask call(ProjectTaskInner inner) {
-                return wrapModel(inner);
+            public Observable<ProjectServiceProjectTask> call(ProjectTaskInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ProjectServiceProjectTask)wrapModel(inner));
+                }
             }
        });
     }

From 5be7f5b1fc7e1700e88ca6c2a85f9ca63ccedd60 Mon Sep 17 00:00:00 2001
From: Yaohai Zheng <yaozheng@microsoft.com>
Date: Wed, 14 Aug 2019 23:45:45 +0800
Subject: [PATCH 06/22] ContainerService: genereate v2019_06_01 (#4990)

---
 .../resource-manager/v2019_06_01/pom.xml      |  135 ++
 .../v2019_06_01/AgentPool.java                |  534 +++++
 .../AgentPoolAvailableVersions.java           |   41 +
 ...rsionsPropertiesAgentPoolVersionsItem.java |   95 +
 .../v2019_06_01/AgentPoolType.java            |   41 +
 .../v2019_06_01/AgentPoolUpgradeProfile.java  |   51 +
 ...lUpgradeProfilePropertiesUpgradesItem.java |   69 +
 .../v2019_06_01/AgentPools.java               |   80 +
 .../v2019_06_01/ContainerService.java         |  270 +++
 .../ContainerServiceAgentPoolProfile.java     |  327 +++
 .../ContainerServiceCustomProfile.java        |   43 +
 .../ContainerServiceDiagnosticsProfile.java   |   43 +
 .../ContainerServiceLinuxProfile.java         |   69 +
 .../ContainerServiceMasterProfile.java        |  271 +++
 .../ContainerServiceNetworkProfile.java       |  207 ++
 .../ContainerServiceOrchestratorProfile.java  |   73 +
 .../ContainerServiceOrchestratorTypes.java    |   50 +
 ...ntainerServiceServicePrincipalProfile.java |   97 +
 .../ContainerServiceSshConfiguration.java     |   45 +
 .../ContainerServiceSshPublicKey.java         |   44 +
 .../ContainerServiceStorageProfileTypes.java  |   41 +
 .../ContainerServiceVMDiagnostics.java        |   58 +
 .../ContainerServiceVMSizeTypes.java          |  557 +++++
 .../ContainerServiceWindowsProfile.java       |   69 +
 .../v2019_06_01/ContainerServices.java        |   35 +
 .../v2019_06_01/CredentialResult.java         |   47 +
 .../v2019_06_01/CredentialResults.java        |   26 +
 .../v2019_06_01/KeyVaultSecretRef.java        |   95 +
 .../v2019_06_01/LoadBalancerSku.java          |   41 +
 .../v2019_06_01/ManagedCluster.java           |  491 ++++
 .../v2019_06_01/ManagedClusterAADProfile.java |  122 +
 .../ManagedClusterAccessProfile.java          |   51 +
 .../ManagedClusterAddonProfile.java           |   70 +
 .../ManagedClusterAgentPoolProfile.java       |   44 +
 ...agedClusterAgentPoolProfileProperties.java |  511 ++++
 .../v2019_06_01/ManagedClusterIdentity.java   |   80 +
 .../ManagedClusterPoolUpgradeProfile.java     |  123 +
 ...ClusterPoolUpgradeProfileUpgradesItem.java |   69 +
 ...ManagedClusterServicePrincipalProfile.java |   70 +
 .../ManagedClusterUpgradeProfile.java         |   46 +
 .../ManagedClusterWindowsProfile.java         |   69 +
 .../v2019_06_01/ManagedClusters.java          |   95 +
 .../v2019_06_01/NetworkPlugin.java            |   41 +
 .../v2019_06_01/NetworkPolicy.java            |   41 +
 .../v2019_06_01/NetworkProfile.java           |   95 +
 .../containerservice/v2019_06_01/OSType.java  |   41 +
 .../OpenShiftAgentPoolProfileRole.java        |   41 +
 .../OpenShiftContainerServiceVMSize.java      |  134 ++
 .../v2019_06_01/OpenShiftManagedCluster.java  |  280 +++
 ...hiftManagedClusterAADIdentityProvider.java |  125 +
 ...enShiftManagedClusterAgentPoolProfile.java |  186 ++
 .../OpenShiftManagedClusterAuthProfile.java   |   44 +
 ...iftManagedClusterBaseIdentityProvider.java |   24 +
 ...enShiftManagedClusterIdentityProvider.java |   70 +
 ...nShiftManagedClusterMasterPoolProfile.java |  161 ++
 .../v2019_06_01/OpenShiftManagedClusters.java |   25 +
 .../v2019_06_01/OpenShiftRouterProfile.java   |   73 +
 .../v2019_06_01/OperationValue.java           |   50 +
 .../v2019_06_01/Operations.java               |   27 +
 .../v2019_06_01/OrchestratorProfile.java      |   95 +
 .../OrchestratorVersionProfile.java           |  148 ++
 .../OrchestratorVersionProfileListResult.java |   41 +
 .../v2019_06_01/PurchasePlan.java             |  123 +
 .../v2019_06_01/ResourceIdentityType.java     |   53 +
 .../v2019_06_01/ScaleSetEvictionPolicy.java   |   41 +
 .../v2019_06_01/ScaleSetPriority.java         |   41 +
 .../v2019_06_01/TagsObject.java               |   44 +
 .../AgentPoolAvailableVersionsImpl.java       |   48 +
 .../AgentPoolAvailableVersionsInner.java      |   92 +
 .../implementation/AgentPoolImpl.java         |  281 +++
 .../implementation/AgentPoolInner.java        |  550 +++++
 .../AgentPoolUpgradeProfileImpl.java          |   59 +
 .../AgentPoolUpgradeProfileInner.java         |  146 ++
 .../implementation/AgentPoolsImpl.java        |  111 +
 .../implementation/AgentPoolsInner.java       |  991 ++++++++
 .../implementation/ContainerServiceImpl.java  |  148 ++
 .../implementation/ContainerServiceInner.java |  255 ++
 .../ContainerServiceManagementClientImpl.java |  239 ++
 .../ContainerServiceManager.java              |  147 ++
 .../implementation/ContainerServicesImpl.java |  151 ++
 .../ContainerServicesInner.java               | 1152 +++++++++
 .../implementation/CredentialResultsImpl.java |   33 +
 .../CredentialResultsInner.java               |   34 +
 .../implementation/IdParsingUtils.java        |   57 +
 .../ManagedClusterAccessProfileImpl.java      |   57 +
 .../ManagedClusterAccessProfileInner.java     |   46 +
 .../implementation/ManagedClusterImpl.java    |  225 ++
 .../implementation/ManagedClusterInner.java   |  441 ++++
 .../ManagedClusterUpgradeProfileImpl.java     |   53 +
 .../ManagedClusterUpgradeProfileInner.java    |  118 +
 .../implementation/ManagedClustersImpl.java   |  203 ++
 .../implementation/ManagedClustersInner.java  | 2070 +++++++++++++++++
 .../OpenShiftManagedClusterImpl.java          |  150 ++
 .../OpenShiftManagedClusterInner.java         |  271 +++
 .../OpenShiftManagedClustersImpl.java         |  138 ++
 .../OpenShiftManagedClustersInner.java        | 1328 +++++++++++
 .../implementation/OperationValueImpl.java    |   56 +
 .../implementation/OperationValueInner.java   |  109 +
 .../implementation/OperationsImpl.java        |   49 +
 .../implementation/OperationsInner.java       |  132 ++
 ...hestratorVersionProfileListResultImpl.java |   48 +
 ...estratorVersionProfileListResultInner.java |   92 +
 .../v2019_06_01/implementation/PageImpl.java  |   75 +
 .../v2019_06_01/implementation/PageImpl1.java |   75 +
 .../implementation/package-info.java          |   11 +
 .../v2019_06_01/package-info.java             |   11 +
 106 files changed, 17691 insertions(+)
 create mode 100644 containerservice/resource-manager/v2019_06_01/pom.xml
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPool.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersions.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolType.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfilePropertiesUpgradesItem.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerService.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceAgentPoolProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceCustomProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceDiagnosticsProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceLinuxProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceMasterProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceNetworkProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorTypes.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceServicePrincipalProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshConfiguration.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshPublicKey.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceStorageProfileTypes.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMDiagnostics.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMSizeTypes.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceWindowsProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServices.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResult.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResults.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/KeyVaultSecretRef.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/LoadBalancerSku.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedCluster.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAADProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAccessProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAddonProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfileProperties.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterIdentity.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfileUpgradesItem.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterServicePrincipalProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterUpgradeProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterWindowsProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusters.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPlugin.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPolicy.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OSType.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftAgentPoolProfileRole.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftContainerServiceVMSize.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedCluster.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAgentPoolProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAuthProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterIdentityProvider.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterMasterPoolProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusters.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftRouterProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OperationValue.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/Operations.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfile.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfileListResult.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/PurchasePlan.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ResourceIdentityType.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetEvictionPolicy.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetPriority.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/TagsObject.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManagementClientImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManager.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/IdParsingUtils.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationsImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationsInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultInner.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/PageImpl.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/PageImpl1.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/package-info.java
 create mode 100644 containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/package-info.java

diff --git a/containerservice/resource-manager/v2019_06_01/pom.xml b/containerservice/resource-manager/v2019_06_01/pom.xml
new file mode 100644
index 000000000000..1c11b07d0195
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_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.containerservice.v2019_06_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-containerservice</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for ContainerService Management</name>
+    <description>This package contains Microsoft ContainerService 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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPool.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPool.java
new file mode 100644
index 000000000000..87e33ee0077c
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPool.java
@@ -0,0 +1,534 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.AgentPoolInner;
+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.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import java.util.List;
+
+/**
+ * Type representing AgentPool.
+ */
+public interface AgentPool extends HasInner<AgentPoolInner>, Indexable, Refreshable<AgentPool>, Updatable<AgentPool.Update>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the agentPoolType value.
+     */
+    AgentPoolType agentPoolType();
+
+    /**
+     * @return the availabilityZones value.
+     */
+    List<String> availabilityZones();
+
+    /**
+     * @return the count value.
+     */
+    int count();
+
+    /**
+     * @return the enableAutoScaling value.
+     */
+    Boolean enableAutoScaling();
+
+    /**
+     * @return the enableNodePublicIP value.
+     */
+    Boolean enableNodePublicIP();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the maxCount value.
+     */
+    Integer maxCount();
+
+    /**
+     * @return the maxPods value.
+     */
+    Integer maxPods();
+
+    /**
+     * @return the minCount value.
+     */
+    Integer minCount();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the nodeTaints value.
+     */
+    List<String> nodeTaints();
+
+    /**
+     * @return the orchestratorVersion value.
+     */
+    String orchestratorVersion();
+
+    /**
+     * @return the osDiskSizeGB value.
+     */
+    Integer osDiskSizeGB();
+
+    /**
+     * @return the osType value.
+     */
+    OSType osType();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the scaleSetEvictionPolicy value.
+     */
+    ScaleSetEvictionPolicy scaleSetEvictionPolicy();
+
+    /**
+     * @return the scaleSetPriority value.
+     */
+    ScaleSetPriority scaleSetPriority();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the vmSize value.
+     */
+    ContainerServiceVMSizeTypes vmSize();
+
+    /**
+     * @return the vnetSubnetID value.
+     */
+    String vnetSubnetID();
+
+    /**
+     * The entirety of the AgentPool definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagedCluster, DefinitionStages.WithCount, DefinitionStages.WithVmSize, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of AgentPool definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a AgentPool definition.
+         */
+        interface Blank extends WithManagedCluster {
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify ManagedCluster.
+         */
+        interface WithManagedCluster {
+           /**
+            * Specifies resourceGroupName, resourceName.
+            * @param resourceGroupName The name of the resource group
+            * @param resourceName The name of the managed cluster resource
+            * @return the next definition stage
+            */
+            WithCount withExistingManagedCluster(String resourceGroupName, String resourceName);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify Count.
+         */
+        interface WithCount {
+           /**
+            * Specifies count.
+            * @param count Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1
+            * @return the next definition stage
+            */
+            WithVmSize withCount(int count);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify VmSize.
+         */
+        interface WithVmSize {
+           /**
+            * Specifies vmSize.
+            * @param vmSize Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'
+            * @return the next definition stage
+            */
+            WithCreate withVmSize(ContainerServiceVMSizeTypes vmSize);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify AgentPoolType.
+         */
+        interface WithAgentPoolType {
+            /**
+             * Specifies agentPoolType.
+             * @param agentPoolType AgentPoolType represents types of an agent pool. Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'
+             * @return the next definition stage
+             */
+            WithCreate withAgentPoolType(AgentPoolType agentPoolType);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify AvailabilityZones.
+         */
+        interface WithAvailabilityZones {
+            /**
+             * Specifies availabilityZones.
+             * @param availabilityZones (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType
+             * @return the next definition stage
+             */
+            WithCreate withAvailabilityZones(List<String> availabilityZones);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify EnableAutoScaling.
+         */
+        interface WithEnableAutoScaling {
+            /**
+             * Specifies enableAutoScaling.
+             * @param enableAutoScaling Whether to enable auto-scaler
+             * @return the next definition stage
+             */
+            WithCreate withEnableAutoScaling(Boolean enableAutoScaling);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify EnableNodePublicIP.
+         */
+        interface WithEnableNodePublicIP {
+            /**
+             * Specifies enableNodePublicIP.
+             * @param enableNodePublicIP Enable public IP for nodes
+             * @return the next definition stage
+             */
+            WithCreate withEnableNodePublicIP(Boolean enableNodePublicIP);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify MaxCount.
+         */
+        interface WithMaxCount {
+            /**
+             * Specifies maxCount.
+             * @param maxCount Maximum number of nodes for auto-scaling
+             * @return the next definition stage
+             */
+            WithCreate withMaxCount(Integer maxCount);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify MaxPods.
+         */
+        interface WithMaxPods {
+            /**
+             * Specifies maxPods.
+             * @param maxPods Maximum number of pods that can run on a node
+             * @return the next definition stage
+             */
+            WithCreate withMaxPods(Integer maxPods);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify MinCount.
+         */
+        interface WithMinCount {
+            /**
+             * Specifies minCount.
+             * @param minCount Minimum number of nodes for auto-scaling
+             * @return the next definition stage
+             */
+            WithCreate withMinCount(Integer minCount);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify NodeTaints.
+         */
+        interface WithNodeTaints {
+            /**
+             * Specifies nodeTaints.
+             * @param nodeTaints Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule
+             * @return the next definition stage
+             */
+            WithCreate withNodeTaints(List<String> nodeTaints);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify OrchestratorVersion.
+         */
+        interface WithOrchestratorVersion {
+            /**
+             * Specifies orchestratorVersion.
+             * @param orchestratorVersion Version of orchestrator specified when creating the managed cluster
+             * @return the next definition stage
+             */
+            WithCreate withOrchestratorVersion(String orchestratorVersion);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify OsDiskSizeGB.
+         */
+        interface WithOsDiskSizeGB {
+            /**
+             * Specifies osDiskSizeGB.
+             * @param osDiskSizeGB OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified
+             * @return the next definition stage
+             */
+            WithCreate withOsDiskSizeGB(Integer osDiskSizeGB);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify OsType.
+         */
+        interface WithOsType {
+            /**
+             * Specifies osType.
+             * @param osType OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'
+             * @return the next definition stage
+             */
+            WithCreate withOsType(OSType osType);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify ScaleSetEvictionPolicy.
+         */
+        interface WithScaleSetEvictionPolicy {
+            /**
+             * Specifies scaleSetEvictionPolicy.
+             * @param scaleSetEvictionPolicy ScaleSetEvictionPolicy to be used to specify eviction policy for low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'
+             * @return the next definition stage
+             */
+            WithCreate withScaleSetEvictionPolicy(ScaleSetEvictionPolicy scaleSetEvictionPolicy);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify ScaleSetPriority.
+         */
+        interface WithScaleSetPriority {
+            /**
+             * Specifies scaleSetPriority.
+             * @param scaleSetPriority ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Low', 'Regular'
+             * @return the next definition stage
+             */
+            WithCreate withScaleSetPriority(ScaleSetPriority scaleSetPriority);
+        }
+
+        /**
+         * The stage of the agentpool definition allowing to specify VnetSubnetID.
+         */
+        interface WithVnetSubnetID {
+            /**
+             * Specifies vnetSubnetID.
+             * @param vnetSubnetID VNet SubnetID specifies the VNet's subnet identifier
+             * @return the next definition stage
+             */
+            WithCreate withVnetSubnetID(String vnetSubnetID);
+        }
+
+        /**
+         * 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<AgentPool>, DefinitionStages.WithAgentPoolType, DefinitionStages.WithAvailabilityZones, DefinitionStages.WithEnableAutoScaling, DefinitionStages.WithEnableNodePublicIP, DefinitionStages.WithMaxCount, DefinitionStages.WithMaxPods, DefinitionStages.WithMinCount, DefinitionStages.WithNodeTaints, DefinitionStages.WithOrchestratorVersion, DefinitionStages.WithOsDiskSizeGB, DefinitionStages.WithOsType, DefinitionStages.WithScaleSetEvictionPolicy, DefinitionStages.WithScaleSetPriority, DefinitionStages.WithVnetSubnetID {
+        }
+    }
+    /**
+     * The template for a AgentPool update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<AgentPool>, UpdateStages.WithAgentPoolType, UpdateStages.WithAvailabilityZones, UpdateStages.WithEnableAutoScaling, UpdateStages.WithEnableNodePublicIP, UpdateStages.WithMaxCount, UpdateStages.WithMaxPods, UpdateStages.WithMinCount, UpdateStages.WithNodeTaints, UpdateStages.WithOrchestratorVersion, UpdateStages.WithOsDiskSizeGB, UpdateStages.WithOsType, UpdateStages.WithScaleSetEvictionPolicy, UpdateStages.WithScaleSetPriority, UpdateStages.WithVnetSubnetID {
+    }
+
+    /**
+     * Grouping of AgentPool update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the agentpool update allowing to specify AgentPoolType.
+         */
+        interface WithAgentPoolType {
+            /**
+             * Specifies agentPoolType.
+             * @param agentPoolType AgentPoolType represents types of an agent pool. Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'
+             * @return the next update stage
+             */
+            Update withAgentPoolType(AgentPoolType agentPoolType);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify AvailabilityZones.
+         */
+        interface WithAvailabilityZones {
+            /**
+             * Specifies availabilityZones.
+             * @param availabilityZones (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType
+             * @return the next update stage
+             */
+            Update withAvailabilityZones(List<String> availabilityZones);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify EnableAutoScaling.
+         */
+        interface WithEnableAutoScaling {
+            /**
+             * Specifies enableAutoScaling.
+             * @param enableAutoScaling Whether to enable auto-scaler
+             * @return the next update stage
+             */
+            Update withEnableAutoScaling(Boolean enableAutoScaling);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify EnableNodePublicIP.
+         */
+        interface WithEnableNodePublicIP {
+            /**
+             * Specifies enableNodePublicIP.
+             * @param enableNodePublicIP Enable public IP for nodes
+             * @return the next update stage
+             */
+            Update withEnableNodePublicIP(Boolean enableNodePublicIP);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify MaxCount.
+         */
+        interface WithMaxCount {
+            /**
+             * Specifies maxCount.
+             * @param maxCount Maximum number of nodes for auto-scaling
+             * @return the next update stage
+             */
+            Update withMaxCount(Integer maxCount);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify MaxPods.
+         */
+        interface WithMaxPods {
+            /**
+             * Specifies maxPods.
+             * @param maxPods Maximum number of pods that can run on a node
+             * @return the next update stage
+             */
+            Update withMaxPods(Integer maxPods);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify MinCount.
+         */
+        interface WithMinCount {
+            /**
+             * Specifies minCount.
+             * @param minCount Minimum number of nodes for auto-scaling
+             * @return the next update stage
+             */
+            Update withMinCount(Integer minCount);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify NodeTaints.
+         */
+        interface WithNodeTaints {
+            /**
+             * Specifies nodeTaints.
+             * @param nodeTaints Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule
+             * @return the next update stage
+             */
+            Update withNodeTaints(List<String> nodeTaints);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify OrchestratorVersion.
+         */
+        interface WithOrchestratorVersion {
+            /**
+             * Specifies orchestratorVersion.
+             * @param orchestratorVersion Version of orchestrator specified when creating the managed cluster
+             * @return the next update stage
+             */
+            Update withOrchestratorVersion(String orchestratorVersion);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify OsDiskSizeGB.
+         */
+        interface WithOsDiskSizeGB {
+            /**
+             * Specifies osDiskSizeGB.
+             * @param osDiskSizeGB OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified
+             * @return the next update stage
+             */
+            Update withOsDiskSizeGB(Integer osDiskSizeGB);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify OsType.
+         */
+        interface WithOsType {
+            /**
+             * Specifies osType.
+             * @param osType OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'
+             * @return the next update stage
+             */
+            Update withOsType(OSType osType);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify ScaleSetEvictionPolicy.
+         */
+        interface WithScaleSetEvictionPolicy {
+            /**
+             * Specifies scaleSetEvictionPolicy.
+             * @param scaleSetEvictionPolicy ScaleSetEvictionPolicy to be used to specify eviction policy for low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'
+             * @return the next update stage
+             */
+            Update withScaleSetEvictionPolicy(ScaleSetEvictionPolicy scaleSetEvictionPolicy);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify ScaleSetPriority.
+         */
+        interface WithScaleSetPriority {
+            /**
+             * Specifies scaleSetPriority.
+             * @param scaleSetPriority ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Low', 'Regular'
+             * @return the next update stage
+             */
+            Update withScaleSetPriority(ScaleSetPriority scaleSetPriority);
+        }
+
+        /**
+         * The stage of the agentpool update allowing to specify VnetSubnetID.
+         */
+        interface WithVnetSubnetID {
+            /**
+             * Specifies vnetSubnetID.
+             * @param vnetSubnetID VNet SubnetID specifies the VNet's subnet identifier
+             * @return the next update stage
+             */
+            Update withVnetSubnetID(String vnetSubnetID);
+        }
+
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersions.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersions.java
new file mode 100644
index 000000000000..a1aa2087d3e6
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersions.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.AgentPoolAvailableVersionsInner;
+import java.util.List;
+
+/**
+ * Type representing AgentPoolAvailableVersions.
+ */
+public interface AgentPoolAvailableVersions extends HasInner<AgentPoolAvailableVersionsInner>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the agentPoolVersions value.
+     */
+    List<AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem> agentPoolVersions();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem.java
new file mode 100644
index 000000000000..95246dfb369b
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem model.
+ */
+public class AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem {
+    /**
+     * Whether this version is the default agent pool version.
+     */
+    @JsonProperty(value = "default")
+    private Boolean defaultProperty;
+
+    /**
+     * Kubernetes version (major, minor, patch).
+     */
+    @JsonProperty(value = "kubernetesVersion")
+    private String kubernetesVersion;
+
+    /**
+     * Whether Kubernetes version is currently in preview.
+     */
+    @JsonProperty(value = "isPreview")
+    private Boolean isPreview;
+
+    /**
+     * Get whether this version is the default agent pool version.
+     *
+     * @return the defaultProperty value
+     */
+    public Boolean defaultProperty() {
+        return this.defaultProperty;
+    }
+
+    /**
+     * Set whether this version is the default agent pool version.
+     *
+     * @param defaultProperty the defaultProperty value to set
+     * @return the AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem object itself.
+     */
+    public AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem withDefaultProperty(Boolean defaultProperty) {
+        this.defaultProperty = defaultProperty;
+        return this;
+    }
+
+    /**
+     * Get kubernetes version (major, minor, patch).
+     *
+     * @return the kubernetesVersion value
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set kubernetes version (major, minor, patch).
+     *
+     * @param kubernetesVersion the kubernetesVersion value to set
+     * @return the AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem object itself.
+     */
+    public AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get whether Kubernetes version is currently in preview.
+     *
+     * @return the isPreview value
+     */
+    public Boolean isPreview() {
+        return this.isPreview;
+    }
+
+    /**
+     * Set whether Kubernetes version is currently in preview.
+     *
+     * @param isPreview the isPreview value to set
+     * @return the AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem object itself.
+     */
+    public AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem withIsPreview(Boolean isPreview) {
+        this.isPreview = isPreview;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolType.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolType.java
new file mode 100644
index 000000000000..d7f0f9851f9d
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolType.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AgentPoolType.
+ */
+public final class AgentPoolType extends ExpandableStringEnum<AgentPoolType> {
+    /** Static value VirtualMachineScaleSets for AgentPoolType. */
+    public static final AgentPoolType VIRTUAL_MACHINE_SCALE_SETS = fromString("VirtualMachineScaleSets");
+
+    /** Static value AvailabilitySet for AgentPoolType. */
+    public static final AgentPoolType AVAILABILITY_SET = fromString("AvailabilitySet");
+
+    /**
+     * Creates or finds a AgentPoolType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AgentPoolType
+     */
+    @JsonCreator
+    public static AgentPoolType fromString(String name) {
+        return fromString(name, AgentPoolType.class);
+    }
+
+    /**
+     * @return known AgentPoolType values
+     */
+    public static Collection<AgentPoolType> values() {
+        return values(AgentPoolType.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfile.java
new file mode 100644
index 000000000000..3513604d3396
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfile.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.AgentPoolUpgradeProfileInner;
+import java.util.List;
+
+/**
+ * Type representing AgentPoolUpgradeProfile.
+ */
+public interface AgentPoolUpgradeProfile extends HasInner<AgentPoolUpgradeProfileInner>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kubernetesVersion value.
+     */
+    String kubernetesVersion();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the osType value.
+     */
+    OSType osType();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the upgrades value.
+     */
+    List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfilePropertiesUpgradesItem.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfilePropertiesUpgradesItem.java
new file mode 100644
index 000000000000..442ccbd5bddc
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPoolUpgradeProfilePropertiesUpgradesItem.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The AgentPoolUpgradeProfilePropertiesUpgradesItem model.
+ */
+public class AgentPoolUpgradeProfilePropertiesUpgradesItem {
+    /**
+     * Kubernetes version (major, minor, patch).
+     */
+    @JsonProperty(value = "kubernetesVersion")
+    private String kubernetesVersion;
+
+    /**
+     * Whether Kubernetes version is currently in preview.
+     */
+    @JsonProperty(value = "isPreview")
+    private Boolean isPreview;
+
+    /**
+     * Get kubernetes version (major, minor, patch).
+     *
+     * @return the kubernetesVersion value
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set kubernetes version (major, minor, patch).
+     *
+     * @param kubernetesVersion the kubernetesVersion value to set
+     * @return the AgentPoolUpgradeProfilePropertiesUpgradesItem object itself.
+     */
+    public AgentPoolUpgradeProfilePropertiesUpgradesItem withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get whether Kubernetes version is currently in preview.
+     *
+     * @return the isPreview value
+     */
+    public Boolean isPreview() {
+        return this.isPreview;
+    }
+
+    /**
+     * Set whether Kubernetes version is currently in preview.
+     *
+     * @param isPreview the isPreview value to set
+     * @return the AgentPoolUpgradeProfilePropertiesUpgradesItem object itself.
+     */
+    public AgentPoolUpgradeProfilePropertiesUpgradesItem withIsPreview(Boolean isPreview) {
+        this.isPreview = isPreview;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.java
new file mode 100644
index 000000000000..f718a036f428
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.AgentPoolsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing AgentPools.
+ */
+public interface AgentPools extends SupportsCreating<AgentPool.DefinitionStages.Blank>, HasInner<AgentPoolsInner> {
+    /**
+     * Gets the agent pool.
+     * Gets the details of the agent pool by managed cluster and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AgentPool> getAsync(String resourceGroupName, String resourceName, String agentPoolName);
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AgentPool> listAsync(final String resourceGroupName, final String resourceName);
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String resourceName, String agentPoolName);
+
+    /**
+     * Gets upgrade profile for an agent pool.
+     * Gets the details of the upgrade profile for an agent pool with a specified resource group and managed cluster name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AgentPoolUpgradeProfile> getUpgradeProfileAsync(String resourceGroupName, String resourceName, String agentPoolName);
+
+    /**
+     * Gets a list of supported versions for the specified agent pool.
+     * Gets a list of supported versions for the specified agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName);
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerService.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerService.java
new file mode 100644
index 000000000000..9036f33ffb4a
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerService.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.containerservice.v2019_06_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.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceInner;
+
+/**
+ * Type representing ContainerService.
+ */
+public interface ContainerService extends HasInner<ContainerServiceInner>, Resource, GroupableResourceCore<ContainerServiceManager, ContainerServiceInner>, HasResourceGroup, Refreshable<ContainerService>, Updatable<ContainerService.Update>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the agentPoolProfiles value.
+     */
+    List<ContainerServiceAgentPoolProfile> agentPoolProfiles();
+
+    /**
+     * @return the customProfile value.
+     */
+    ContainerServiceCustomProfile customProfile();
+
+    /**
+     * @return the diagnosticsProfile value.
+     */
+    ContainerServiceDiagnosticsProfile diagnosticsProfile();
+
+    /**
+     * @return the linuxProfile value.
+     */
+    ContainerServiceLinuxProfile linuxProfile();
+
+    /**
+     * @return the masterProfile value.
+     */
+    ContainerServiceMasterProfile masterProfile();
+
+    /**
+     * @return the orchestratorProfile value.
+     */
+    ContainerServiceOrchestratorProfile orchestratorProfile();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the servicePrincipalProfile value.
+     */
+    ContainerServiceServicePrincipalProfile servicePrincipalProfile();
+
+    /**
+     * @return the windowsProfile value.
+     */
+    ContainerServiceWindowsProfile windowsProfile();
+
+    /**
+     * The entirety of the ContainerService definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithLinuxProfile, DefinitionStages.WithMasterProfile, DefinitionStages.WithOrchestratorProfile, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ContainerService definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ContainerService definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ContainerService definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithLinuxProfile> {
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify LinuxProfile.
+         */
+        interface WithLinuxProfile {
+           /**
+            * Specifies linuxProfile.
+            * @param linuxProfile Profile for Linux VMs in the container service cluster
+            * @return the next definition stage
+*/
+            WithMasterProfile withLinuxProfile(ContainerServiceLinuxProfile linuxProfile);
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify MasterProfile.
+         */
+        interface WithMasterProfile {
+           /**
+            * Specifies masterProfile.
+            * @param masterProfile Profile for the container service master
+            * @return the next definition stage
+*/
+            WithOrchestratorProfile withMasterProfile(ContainerServiceMasterProfile masterProfile);
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify OrchestratorProfile.
+         */
+        interface WithOrchestratorProfile {
+           /**
+            * Specifies orchestratorProfile.
+            * @param orchestratorProfile Profile for the container service orchestrator
+            * @return the next definition stage
+*/
+            WithCreate withOrchestratorProfile(ContainerServiceOrchestratorProfile orchestratorProfile);
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify AgentPoolProfiles.
+         */
+        interface WithAgentPoolProfiles {
+            /**
+             * Specifies agentPoolProfiles.
+             * @param agentPoolProfiles Properties of the agent pool
+             * @return the next definition stage
+             */
+            WithCreate withAgentPoolProfiles(List<ContainerServiceAgentPoolProfile> agentPoolProfiles);
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify CustomProfile.
+         */
+        interface WithCustomProfile {
+            /**
+             * Specifies customProfile.
+             * @param customProfile Properties to configure a custom container service cluster
+             * @return the next definition stage
+             */
+            WithCreate withCustomProfile(ContainerServiceCustomProfile customProfile);
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify DiagnosticsProfile.
+         */
+        interface WithDiagnosticsProfile {
+            /**
+             * Specifies diagnosticsProfile.
+             * @param diagnosticsProfile Profile for diagnostics in the container service cluster
+             * @return the next definition stage
+             */
+            WithCreate withDiagnosticsProfile(ContainerServiceDiagnosticsProfile diagnosticsProfile);
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify ServicePrincipalProfile.
+         */
+        interface WithServicePrincipalProfile {
+            /**
+             * Specifies servicePrincipalProfile.
+             * @param servicePrincipalProfile Information about a service principal identity for the cluster to use for manipulating Azure APIs. Exact one of secret or keyVaultSecretRef need to be specified
+             * @return the next definition stage
+             */
+            WithCreate withServicePrincipalProfile(ContainerServiceServicePrincipalProfile servicePrincipalProfile);
+        }
+
+        /**
+         * The stage of the containerservice definition allowing to specify WindowsProfile.
+         */
+        interface WithWindowsProfile {
+            /**
+             * Specifies windowsProfile.
+             * @param windowsProfile Profile for Windows VMs in the container service cluster
+             * @return the next definition stage
+             */
+            WithCreate withWindowsProfile(ContainerServiceWindowsProfile windowsProfile);
+        }
+
+        /**
+         * 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<ContainerService>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAgentPoolProfiles, DefinitionStages.WithCustomProfile, DefinitionStages.WithDiagnosticsProfile, DefinitionStages.WithServicePrincipalProfile, DefinitionStages.WithWindowsProfile {
+        }
+    }
+    /**
+     * The template for a ContainerService update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ContainerService>, Resource.UpdateWithTags<Update>, UpdateStages.WithAgentPoolProfiles, UpdateStages.WithCustomProfile, UpdateStages.WithDiagnosticsProfile, UpdateStages.WithServicePrincipalProfile, UpdateStages.WithWindowsProfile {
+    }
+
+    /**
+     * Grouping of ContainerService update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the containerservice update allowing to specify AgentPoolProfiles.
+         */
+        interface WithAgentPoolProfiles {
+            /**
+             * Specifies agentPoolProfiles.
+             * @param agentPoolProfiles Properties of the agent pool
+             * @return the next update stage
+             */
+            Update withAgentPoolProfiles(List<ContainerServiceAgentPoolProfile> agentPoolProfiles);
+        }
+
+        /**
+         * The stage of the containerservice update allowing to specify CustomProfile.
+         */
+        interface WithCustomProfile {
+            /**
+             * Specifies customProfile.
+             * @param customProfile Properties to configure a custom container service cluster
+             * @return the next update stage
+             */
+            Update withCustomProfile(ContainerServiceCustomProfile customProfile);
+        }
+
+        /**
+         * The stage of the containerservice update allowing to specify DiagnosticsProfile.
+         */
+        interface WithDiagnosticsProfile {
+            /**
+             * Specifies diagnosticsProfile.
+             * @param diagnosticsProfile Profile for diagnostics in the container service cluster
+             * @return the next update stage
+             */
+            Update withDiagnosticsProfile(ContainerServiceDiagnosticsProfile diagnosticsProfile);
+        }
+
+        /**
+         * The stage of the containerservice update allowing to specify ServicePrincipalProfile.
+         */
+        interface WithServicePrincipalProfile {
+            /**
+             * Specifies servicePrincipalProfile.
+             * @param servicePrincipalProfile Information about a service principal identity for the cluster to use for manipulating Azure APIs. Exact one of secret or keyVaultSecretRef need to be specified
+             * @return the next update stage
+             */
+            Update withServicePrincipalProfile(ContainerServiceServicePrincipalProfile servicePrincipalProfile);
+        }
+
+        /**
+         * The stage of the containerservice update allowing to specify WindowsProfile.
+         */
+        interface WithWindowsProfile {
+            /**
+             * Specifies windowsProfile.
+             * @param windowsProfile Profile for Windows VMs in the container service cluster
+             * @return the next update stage
+             */
+            Update withWindowsProfile(ContainerServiceWindowsProfile windowsProfile);
+        }
+
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceAgentPoolProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceAgentPoolProfile.java
new file mode 100644
index 000000000000..8cff34a1270c
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceAgentPoolProfile.java
@@ -0,0 +1,327 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for the container service agent pool.
+ */
+public class ContainerServiceAgentPoolProfile {
+    /**
+     * Unique name of the agent pool profile in the context of the subscription
+     * and resource group.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Number of agents (VMs) to host docker containers. Allowed values must be
+     * in the range of 1 to 100 (inclusive). The default value is 1.
+     */
+    @JsonProperty(value = "count")
+    private Integer count;
+
+    /**
+     * Size of agent VMs. Possible values include: 'Standard_A1',
+     * 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
+     * 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
+     * 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
+     * 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
+     * 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
+     * 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
+     * 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
+     * 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
+     * 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
+     * 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
+     * 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
+     * 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
+     * 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
+     * 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
+     * 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
+     * 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
+     * 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
+     * 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo',
+     * 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
+     * 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2',
+     * 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14',
+     * 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2',
+     * 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
+     * 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo',
+     * 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo',
+     * 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
+     * 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3',
+     * 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3',
+     * 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3',
+     * 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
+     * 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3',
+     * 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1',
+     * 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s',
+     * 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2',
+     * 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
+     * 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2',
+     * 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4',
+     * 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3',
+     * 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
+     * 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m',
+     * 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m',
+     * 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s',
+     * 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
+     * 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms',
+     * 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2',
+     * 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
+     * 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2',
+     * 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2',
+     * 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
+     * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
+     * 'Standard_NV6'.
+     */
+    @JsonProperty(value = "vmSize", required = true)
+    private ContainerServiceVMSizeTypes vmSize;
+
+    /**
+     * OS Disk Size in GB to be used to specify the disk size for every machine
+     * in this master/agent pool. If you specify 0, it will apply the default
+     * osDisk size according to the vmSize specified.
+     */
+    @JsonProperty(value = "osDiskSizeGB")
+    private Integer osDiskSizeGB;
+
+    /**
+     * DNS prefix to be used to create the FQDN for the agent pool.
+     */
+    @JsonProperty(value = "dnsPrefix")
+    private String dnsPrefix;
+
+    /**
+     * FQDN for the agent pool.
+     */
+    @JsonProperty(value = "fqdn", access = JsonProperty.Access.WRITE_ONLY)
+    private String fqdn;
+
+    /**
+     * Ports number array used to expose on this agent pool. The default opened
+     * ports are different based on your choice of orchestrator.
+     */
+    @JsonProperty(value = "ports")
+    private List<Integer> ports;
+
+    /**
+     * Storage profile specifies what kind of storage used. Choose from
+     * StorageAccount and ManagedDisks. Leave it empty, we will choose for you
+     * based on the orchestrator choice. Possible values include:
+     * 'StorageAccount', 'ManagedDisks'.
+     */
+    @JsonProperty(value = "storageProfile")
+    private ContainerServiceStorageProfileTypes storageProfile;
+
+    /**
+     * VNet SubnetID specifies the VNet's subnet identifier.
+     */
+    @JsonProperty(value = "vnetSubnetID")
+    private String vnetSubnetID;
+
+    /**
+     * OsType to be used to specify os type. Choose from Linux and Windows.
+     * Default to Linux. Possible values include: 'Linux', 'Windows'.
+     */
+    @JsonProperty(value = "osType")
+    private OSType osType;
+
+    /**
+     * Get unique name of the agent pool profile in the context of the subscription and resource group.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set unique name of the agent pool profile in the context of the subscription and resource group.
+     *
+     * @param name the name value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
+     *
+     * @return the count value
+     */
+    public Integer count() {
+        return this.count;
+    }
+
+    /**
+     * Set number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
+     *
+     * @param count the count value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withCount(Integer count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @return the vmSize value
+     */
+    public ContainerServiceVMSizeTypes vmSize() {
+        return this.vmSize;
+    }
+
+    /**
+     * Set size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @param vmSize the vmSize value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withVmSize(ContainerServiceVMSizeTypes vmSize) {
+        this.vmSize = vmSize;
+        return this;
+    }
+
+    /**
+     * Get oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @return the osDiskSizeGB value
+     */
+    public Integer osDiskSizeGB() {
+        return this.osDiskSizeGB;
+    }
+
+    /**
+     * Set oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @param osDiskSizeGB the osDiskSizeGB value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withOsDiskSizeGB(Integer osDiskSizeGB) {
+        this.osDiskSizeGB = osDiskSizeGB;
+        return this;
+    }
+
+    /**
+     * Get dNS prefix to be used to create the FQDN for the agent pool.
+     *
+     * @return the dnsPrefix value
+     */
+    public String dnsPrefix() {
+        return this.dnsPrefix;
+    }
+
+    /**
+     * Set dNS prefix to be used to create the FQDN for the agent pool.
+     *
+     * @param dnsPrefix the dnsPrefix value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withDnsPrefix(String dnsPrefix) {
+        this.dnsPrefix = dnsPrefix;
+        return this;
+    }
+
+    /**
+     * Get fQDN for the agent pool.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Get ports number array used to expose on this agent pool. The default opened ports are different based on your choice of orchestrator.
+     *
+     * @return the ports value
+     */
+    public List<Integer> ports() {
+        return this.ports;
+    }
+
+    /**
+     * Set ports number array used to expose on this agent pool. The default opened ports are different based on your choice of orchestrator.
+     *
+     * @param ports the ports value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withPorts(List<Integer> ports) {
+        this.ports = ports;
+        return this;
+    }
+
+    /**
+     * Get storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. Possible values include: 'StorageAccount', 'ManagedDisks'.
+     *
+     * @return the storageProfile value
+     */
+    public ContainerServiceStorageProfileTypes storageProfile() {
+        return this.storageProfile;
+    }
+
+    /**
+     * Set storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. Possible values include: 'StorageAccount', 'ManagedDisks'.
+     *
+     * @param storageProfile the storageProfile value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withStorageProfile(ContainerServiceStorageProfileTypes storageProfile) {
+        this.storageProfile = storageProfile;
+        return this;
+    }
+
+    /**
+     * Get vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @return the vnetSubnetID value
+     */
+    public String vnetSubnetID() {
+        return this.vnetSubnetID;
+    }
+
+    /**
+     * Set vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @param vnetSubnetID the vnetSubnetID value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withVnetSubnetID(String vnetSubnetID) {
+        this.vnetSubnetID = vnetSubnetID;
+        return this;
+    }
+
+    /**
+     * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @return the osType value
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @param osType the osType value to set
+     * @return the ContainerServiceAgentPoolProfile object itself.
+     */
+    public ContainerServiceAgentPoolProfile withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceCustomProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceCustomProfile.java
new file mode 100644
index 000000000000..fc9fc6aa73af
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceCustomProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties to configure a custom container service cluster.
+ */
+public class ContainerServiceCustomProfile {
+    /**
+     * The name of the custom orchestrator to use.
+     */
+    @JsonProperty(value = "orchestrator", required = true)
+    private String orchestrator;
+
+    /**
+     * Get the name of the custom orchestrator to use.
+     *
+     * @return the orchestrator value
+     */
+    public String orchestrator() {
+        return this.orchestrator;
+    }
+
+    /**
+     * Set the name of the custom orchestrator to use.
+     *
+     * @param orchestrator the orchestrator value to set
+     * @return the ContainerServiceCustomProfile object itself.
+     */
+    public ContainerServiceCustomProfile withOrchestrator(String orchestrator) {
+        this.orchestrator = orchestrator;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceDiagnosticsProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceDiagnosticsProfile.java
new file mode 100644
index 000000000000..3da42c78fdd5
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceDiagnosticsProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for diagnostics on the container service cluster.
+ */
+public class ContainerServiceDiagnosticsProfile {
+    /**
+     * Profile for diagnostics on the container service VMs.
+     */
+    @JsonProperty(value = "vmDiagnostics", required = true)
+    private ContainerServiceVMDiagnostics vmDiagnostics;
+
+    /**
+     * Get profile for diagnostics on the container service VMs.
+     *
+     * @return the vmDiagnostics value
+     */
+    public ContainerServiceVMDiagnostics vmDiagnostics() {
+        return this.vmDiagnostics;
+    }
+
+    /**
+     * Set profile for diagnostics on the container service VMs.
+     *
+     * @param vmDiagnostics the vmDiagnostics value to set
+     * @return the ContainerServiceDiagnosticsProfile object itself.
+     */
+    public ContainerServiceDiagnosticsProfile withVmDiagnostics(ContainerServiceVMDiagnostics vmDiagnostics) {
+        this.vmDiagnostics = vmDiagnostics;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceLinuxProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceLinuxProfile.java
new file mode 100644
index 000000000000..df73afee1fdc
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceLinuxProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for Linux VMs in the container service cluster.
+ */
+public class ContainerServiceLinuxProfile {
+    /**
+     * The administrator username to use for Linux VMs.
+     */
+    @JsonProperty(value = "adminUsername", required = true)
+    private String adminUsername;
+
+    /**
+     * SSH configuration for Linux-based VMs running on Azure.
+     */
+    @JsonProperty(value = "ssh", required = true)
+    private ContainerServiceSshConfiguration ssh;
+
+    /**
+     * Get the administrator username to use for Linux VMs.
+     *
+     * @return the adminUsername value
+     */
+    public String adminUsername() {
+        return this.adminUsername;
+    }
+
+    /**
+     * Set the administrator username to use for Linux VMs.
+     *
+     * @param adminUsername the adminUsername value to set
+     * @return the ContainerServiceLinuxProfile object itself.
+     */
+    public ContainerServiceLinuxProfile withAdminUsername(String adminUsername) {
+        this.adminUsername = adminUsername;
+        return this;
+    }
+
+    /**
+     * Get sSH configuration for Linux-based VMs running on Azure.
+     *
+     * @return the ssh value
+     */
+    public ContainerServiceSshConfiguration ssh() {
+        return this.ssh;
+    }
+
+    /**
+     * Set sSH configuration for Linux-based VMs running on Azure.
+     *
+     * @param ssh the ssh value to set
+     * @return the ContainerServiceLinuxProfile object itself.
+     */
+    public ContainerServiceLinuxProfile withSsh(ContainerServiceSshConfiguration ssh) {
+        this.ssh = ssh;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceMasterProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceMasterProfile.java
new file mode 100644
index 000000000000..70c76ec57b3b
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceMasterProfile.java
@@ -0,0 +1,271 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for the container service master.
+ */
+public class ContainerServiceMasterProfile {
+    /**
+     * Number of masters (VMs) in the container service cluster. Allowed values
+     * are 1, 3, and 5. The default value is 1.
+     */
+    @JsonProperty(value = "count")
+    private Integer count;
+
+    /**
+     * DNS prefix to be used to create the FQDN for the master pool.
+     */
+    @JsonProperty(value = "dnsPrefix", required = true)
+    private String dnsPrefix;
+
+    /**
+     * Size of agent VMs. Possible values include: 'Standard_A1',
+     * 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
+     * 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
+     * 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
+     * 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
+     * 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
+     * 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
+     * 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
+     * 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
+     * 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
+     * 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
+     * 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
+     * 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
+     * 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
+     * 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
+     * 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
+     * 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
+     * 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
+     * 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo',
+     * 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
+     * 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2',
+     * 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14',
+     * 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2',
+     * 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
+     * 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo',
+     * 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo',
+     * 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
+     * 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3',
+     * 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3',
+     * 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3',
+     * 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
+     * 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3',
+     * 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1',
+     * 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s',
+     * 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2',
+     * 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
+     * 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2',
+     * 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4',
+     * 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3',
+     * 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
+     * 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m',
+     * 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m',
+     * 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s',
+     * 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
+     * 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms',
+     * 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2',
+     * 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
+     * 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2',
+     * 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2',
+     * 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
+     * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
+     * 'Standard_NV6'.
+     */
+    @JsonProperty(value = "vmSize", required = true)
+    private ContainerServiceVMSizeTypes vmSize;
+
+    /**
+     * OS Disk Size in GB to be used to specify the disk size for every machine
+     * in this master/agent pool. If you specify 0, it will apply the default
+     * osDisk size according to the vmSize specified.
+     */
+    @JsonProperty(value = "osDiskSizeGB")
+    private Integer osDiskSizeGB;
+
+    /**
+     * VNet SubnetID specifies the VNet's subnet identifier.
+     */
+    @JsonProperty(value = "vnetSubnetID")
+    private String vnetSubnetID;
+
+    /**
+     * FirstConsecutiveStaticIP used to specify the first static ip of masters.
+     */
+    @JsonProperty(value = "firstConsecutiveStaticIP")
+    private String firstConsecutiveStaticIP;
+
+    /**
+     * Storage profile specifies what kind of storage used. Choose from
+     * StorageAccount and ManagedDisks. Leave it empty, we will choose for you
+     * based on the orchestrator choice. Possible values include:
+     * 'StorageAccount', 'ManagedDisks'.
+     */
+    @JsonProperty(value = "storageProfile")
+    private ContainerServiceStorageProfileTypes storageProfile;
+
+    /**
+     * FQDN for the master pool.
+     */
+    @JsonProperty(value = "fqdn", access = JsonProperty.Access.WRITE_ONLY)
+    private String fqdn;
+
+    /**
+     * Get number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1.
+     *
+     * @return the count value
+     */
+    public Integer count() {
+        return this.count;
+    }
+
+    /**
+     * Set number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1.
+     *
+     * @param count the count value to set
+     * @return the ContainerServiceMasterProfile object itself.
+     */
+    public ContainerServiceMasterProfile withCount(Integer count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get dNS prefix to be used to create the FQDN for the master pool.
+     *
+     * @return the dnsPrefix value
+     */
+    public String dnsPrefix() {
+        return this.dnsPrefix;
+    }
+
+    /**
+     * Set dNS prefix to be used to create the FQDN for the master pool.
+     *
+     * @param dnsPrefix the dnsPrefix value to set
+     * @return the ContainerServiceMasterProfile object itself.
+     */
+    public ContainerServiceMasterProfile withDnsPrefix(String dnsPrefix) {
+        this.dnsPrefix = dnsPrefix;
+        return this;
+    }
+
+    /**
+     * Get size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @return the vmSize value
+     */
+    public ContainerServiceVMSizeTypes vmSize() {
+        return this.vmSize;
+    }
+
+    /**
+     * Set size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @param vmSize the vmSize value to set
+     * @return the ContainerServiceMasterProfile object itself.
+     */
+    public ContainerServiceMasterProfile withVmSize(ContainerServiceVMSizeTypes vmSize) {
+        this.vmSize = vmSize;
+        return this;
+    }
+
+    /**
+     * Get oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @return the osDiskSizeGB value
+     */
+    public Integer osDiskSizeGB() {
+        return this.osDiskSizeGB;
+    }
+
+    /**
+     * Set oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @param osDiskSizeGB the osDiskSizeGB value to set
+     * @return the ContainerServiceMasterProfile object itself.
+     */
+    public ContainerServiceMasterProfile withOsDiskSizeGB(Integer osDiskSizeGB) {
+        this.osDiskSizeGB = osDiskSizeGB;
+        return this;
+    }
+
+    /**
+     * Get vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @return the vnetSubnetID value
+     */
+    public String vnetSubnetID() {
+        return this.vnetSubnetID;
+    }
+
+    /**
+     * Set vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @param vnetSubnetID the vnetSubnetID value to set
+     * @return the ContainerServiceMasterProfile object itself.
+     */
+    public ContainerServiceMasterProfile withVnetSubnetID(String vnetSubnetID) {
+        this.vnetSubnetID = vnetSubnetID;
+        return this;
+    }
+
+    /**
+     * Get firstConsecutiveStaticIP used to specify the first static ip of masters.
+     *
+     * @return the firstConsecutiveStaticIP value
+     */
+    public String firstConsecutiveStaticIP() {
+        return this.firstConsecutiveStaticIP;
+    }
+
+    /**
+     * Set firstConsecutiveStaticIP used to specify the first static ip of masters.
+     *
+     * @param firstConsecutiveStaticIP the firstConsecutiveStaticIP value to set
+     * @return the ContainerServiceMasterProfile object itself.
+     */
+    public ContainerServiceMasterProfile withFirstConsecutiveStaticIP(String firstConsecutiveStaticIP) {
+        this.firstConsecutiveStaticIP = firstConsecutiveStaticIP;
+        return this;
+    }
+
+    /**
+     * Get storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. Possible values include: 'StorageAccount', 'ManagedDisks'.
+     *
+     * @return the storageProfile value
+     */
+    public ContainerServiceStorageProfileTypes storageProfile() {
+        return this.storageProfile;
+    }
+
+    /**
+     * Set storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. Possible values include: 'StorageAccount', 'ManagedDisks'.
+     *
+     * @param storageProfile the storageProfile value to set
+     * @return the ContainerServiceMasterProfile object itself.
+     */
+    public ContainerServiceMasterProfile withStorageProfile(ContainerServiceStorageProfileTypes storageProfile) {
+        this.storageProfile = storageProfile;
+        return this;
+    }
+
+    /**
+     * Get fQDN for the master pool.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceNetworkProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceNetworkProfile.java
new file mode 100644
index 000000000000..b495160ae4ef
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceNetworkProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile of network configuration.
+ */
+public class ContainerServiceNetworkProfile {
+    /**
+     * Network plugin used for building Kubernetes network. Possible values
+     * include: 'azure', 'kubenet'.
+     */
+    @JsonProperty(value = "networkPlugin")
+    private NetworkPlugin networkPlugin;
+
+    /**
+     * Network policy used for building Kubernetes network. Possible values
+     * include: 'calico', 'azure'.
+     */
+    @JsonProperty(value = "networkPolicy")
+    private NetworkPolicy networkPolicy;
+
+    /**
+     * A CIDR notation IP range from which to assign pod IPs when kubenet is
+     * used.
+     */
+    @JsonProperty(value = "podCidr")
+    private String podCidr;
+
+    /**
+     * A CIDR notation IP range from which to assign service cluster IPs. It
+     * must not overlap with any Subnet IP ranges.
+     */
+    @JsonProperty(value = "serviceCidr")
+    private String serviceCidr;
+
+    /**
+     * An IP address assigned to the Kubernetes DNS service. It must be within
+     * the Kubernetes service address range specified in serviceCidr.
+     */
+    @JsonProperty(value = "dnsServiceIP")
+    private String dnsServiceIP;
+
+    /**
+     * A CIDR notation IP range assigned to the Docker bridge network. It must
+     * not overlap with any Subnet IP ranges or the Kubernetes service address
+     * range.
+     */
+    @JsonProperty(value = "dockerBridgeCidr")
+    private String dockerBridgeCidr;
+
+    /**
+     * The load balancer sku for the managed cluster. Possible values include:
+     * 'standard', 'basic'.
+     */
+    @JsonProperty(value = "loadBalancerSku")
+    private LoadBalancerSku loadBalancerSku;
+
+    /**
+     * Get network plugin used for building Kubernetes network. Possible values include: 'azure', 'kubenet'.
+     *
+     * @return the networkPlugin value
+     */
+    public NetworkPlugin networkPlugin() {
+        return this.networkPlugin;
+    }
+
+    /**
+     * Set network plugin used for building Kubernetes network. Possible values include: 'azure', 'kubenet'.
+     *
+     * @param networkPlugin the networkPlugin value to set
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withNetworkPlugin(NetworkPlugin networkPlugin) {
+        this.networkPlugin = networkPlugin;
+        return this;
+    }
+
+    /**
+     * Get network policy used for building Kubernetes network. Possible values include: 'calico', 'azure'.
+     *
+     * @return the networkPolicy value
+     */
+    public NetworkPolicy networkPolicy() {
+        return this.networkPolicy;
+    }
+
+    /**
+     * Set network policy used for building Kubernetes network. Possible values include: 'calico', 'azure'.
+     *
+     * @param networkPolicy the networkPolicy value to set
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withNetworkPolicy(NetworkPolicy networkPolicy) {
+        this.networkPolicy = networkPolicy;
+        return this;
+    }
+
+    /**
+     * Get a CIDR notation IP range from which to assign pod IPs when kubenet is used.
+     *
+     * @return the podCidr value
+     */
+    public String podCidr() {
+        return this.podCidr;
+    }
+
+    /**
+     * Set a CIDR notation IP range from which to assign pod IPs when kubenet is used.
+     *
+     * @param podCidr the podCidr value to set
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withPodCidr(String podCidr) {
+        this.podCidr = podCidr;
+        return this;
+    }
+
+    /**
+     * Get a CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges.
+     *
+     * @return the serviceCidr value
+     */
+    public String serviceCidr() {
+        return this.serviceCidr;
+    }
+
+    /**
+     * Set a CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges.
+     *
+     * @param serviceCidr the serviceCidr value to set
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withServiceCidr(String serviceCidr) {
+        this.serviceCidr = serviceCidr;
+        return this;
+    }
+
+    /**
+     * Get an IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr.
+     *
+     * @return the dnsServiceIP value
+     */
+    public String dnsServiceIP() {
+        return this.dnsServiceIP;
+    }
+
+    /**
+     * Set an IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr.
+     *
+     * @param dnsServiceIP the dnsServiceIP value to set
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withDnsServiceIP(String dnsServiceIP) {
+        this.dnsServiceIP = dnsServiceIP;
+        return this;
+    }
+
+    /**
+     * Get a CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range.
+     *
+     * @return the dockerBridgeCidr value
+     */
+    public String dockerBridgeCidr() {
+        return this.dockerBridgeCidr;
+    }
+
+    /**
+     * Set a CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range.
+     *
+     * @param dockerBridgeCidr the dockerBridgeCidr value to set
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withDockerBridgeCidr(String dockerBridgeCidr) {
+        this.dockerBridgeCidr = dockerBridgeCidr;
+        return this;
+    }
+
+    /**
+     * Get the load balancer sku for the managed cluster. Possible values include: 'standard', 'basic'.
+     *
+     * @return the loadBalancerSku value
+     */
+    public LoadBalancerSku loadBalancerSku() {
+        return this.loadBalancerSku;
+    }
+
+    /**
+     * Set the load balancer sku for the managed cluster. Possible values include: 'standard', 'basic'.
+     *
+     * @param loadBalancerSku the loadBalancerSku value to set
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withLoadBalancerSku(LoadBalancerSku loadBalancerSku) {
+        this.loadBalancerSku = loadBalancerSku;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorProfile.java
new file mode 100644
index 000000000000..2940f1cdbbc7
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for the container service orchestrator.
+ */
+public class ContainerServiceOrchestratorProfile {
+    /**
+     * The orchestrator to use to manage container service cluster resources.
+     * Valid values are Kubernetes, Swarm, DCOS, DockerCE and Custom. Possible
+     * values include: 'Kubernetes', 'Swarm', 'DCOS', 'DockerCE', 'Custom'.
+     */
+    @JsonProperty(value = "orchestratorType", required = true)
+    private ContainerServiceOrchestratorTypes orchestratorType;
+
+    /**
+     * The version of the orchestrator to use. You can specify the
+     * major.minor.patch part of the actual version.For example, you can
+     * specify version as "1.6.11".
+     */
+    @JsonProperty(value = "orchestratorVersion")
+    private String orchestratorVersion;
+
+    /**
+     * Get the orchestrator to use to manage container service cluster resources. Valid values are Kubernetes, Swarm, DCOS, DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', 'DCOS', 'DockerCE', 'Custom'.
+     *
+     * @return the orchestratorType value
+     */
+    public ContainerServiceOrchestratorTypes orchestratorType() {
+        return this.orchestratorType;
+    }
+
+    /**
+     * Set the orchestrator to use to manage container service cluster resources. Valid values are Kubernetes, Swarm, DCOS, DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', 'DCOS', 'DockerCE', 'Custom'.
+     *
+     * @param orchestratorType the orchestratorType value to set
+     * @return the ContainerServiceOrchestratorProfile object itself.
+     */
+    public ContainerServiceOrchestratorProfile withOrchestratorType(ContainerServiceOrchestratorTypes orchestratorType) {
+        this.orchestratorType = orchestratorType;
+        return this;
+    }
+
+    /**
+     * Get the version of the orchestrator to use. You can specify the major.minor.patch part of the actual version.For example, you can specify version as "1.6.11".
+     *
+     * @return the orchestratorVersion value
+     */
+    public String orchestratorVersion() {
+        return this.orchestratorVersion;
+    }
+
+    /**
+     * Set the version of the orchestrator to use. You can specify the major.minor.patch part of the actual version.For example, you can specify version as "1.6.11".
+     *
+     * @param orchestratorVersion the orchestratorVersion value to set
+     * @return the ContainerServiceOrchestratorProfile object itself.
+     */
+    public ContainerServiceOrchestratorProfile withOrchestratorVersion(String orchestratorVersion) {
+        this.orchestratorVersion = orchestratorVersion;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorTypes.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorTypes.java
new file mode 100644
index 000000000000..63230266e90a
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceOrchestratorTypes.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ContainerServiceOrchestratorTypes.
+ */
+public final class ContainerServiceOrchestratorTypes extends ExpandableStringEnum<ContainerServiceOrchestratorTypes> {
+    /** Static value Kubernetes for ContainerServiceOrchestratorTypes. */
+    public static final ContainerServiceOrchestratorTypes KUBERNETES = fromString("Kubernetes");
+
+    /** Static value Swarm for ContainerServiceOrchestratorTypes. */
+    public static final ContainerServiceOrchestratorTypes SWARM = fromString("Swarm");
+
+    /** Static value DCOS for ContainerServiceOrchestratorTypes. */
+    public static final ContainerServiceOrchestratorTypes DCOS = fromString("DCOS");
+
+    /** Static value DockerCE for ContainerServiceOrchestratorTypes. */
+    public static final ContainerServiceOrchestratorTypes DOCKER_CE = fromString("DockerCE");
+
+    /** Static value Custom for ContainerServiceOrchestratorTypes. */
+    public static final ContainerServiceOrchestratorTypes CUSTOM = fromString("Custom");
+
+    /**
+     * Creates or finds a ContainerServiceOrchestratorTypes from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ContainerServiceOrchestratorTypes
+     */
+    @JsonCreator
+    public static ContainerServiceOrchestratorTypes fromString(String name) {
+        return fromString(name, ContainerServiceOrchestratorTypes.class);
+    }
+
+    /**
+     * @return known ContainerServiceOrchestratorTypes values
+     */
+    public static Collection<ContainerServiceOrchestratorTypes> values() {
+        return values(ContainerServiceOrchestratorTypes.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceServicePrincipalProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceServicePrincipalProfile.java
new file mode 100644
index 000000000000..4592b6b8a03a
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceServicePrincipalProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information about a service principal identity for the cluster to use for
+ * manipulating Azure APIs. Either secret or keyVaultSecretRef must be
+ * specified.
+ */
+public class ContainerServiceServicePrincipalProfile {
+    /**
+     * The ID for the service principal.
+     */
+    @JsonProperty(value = "clientId", required = true)
+    private String clientId;
+
+    /**
+     * The secret password associated with the service principal in plain text.
+     */
+    @JsonProperty(value = "secret")
+    private String secret;
+
+    /**
+     * Reference to a secret stored in Azure Key Vault.
+     */
+    @JsonProperty(value = "keyVaultSecretRef")
+    private KeyVaultSecretRef keyVaultSecretRef;
+
+    /**
+     * Get the ID for the service principal.
+     *
+     * @return the clientId value
+     */
+    public String clientId() {
+        return this.clientId;
+    }
+
+    /**
+     * Set the ID for the service principal.
+     *
+     * @param clientId the clientId value to set
+     * @return the ContainerServiceServicePrincipalProfile object itself.
+     */
+    public ContainerServiceServicePrincipalProfile withClientId(String clientId) {
+        this.clientId = clientId;
+        return this;
+    }
+
+    /**
+     * Get the secret password associated with the service principal in plain text.
+     *
+     * @return the secret value
+     */
+    public String secret() {
+        return this.secret;
+    }
+
+    /**
+     * Set the secret password associated with the service principal in plain text.
+     *
+     * @param secret the secret value to set
+     * @return the ContainerServiceServicePrincipalProfile object itself.
+     */
+    public ContainerServiceServicePrincipalProfile withSecret(String secret) {
+        this.secret = secret;
+        return this;
+    }
+
+    /**
+     * Get reference to a secret stored in Azure Key Vault.
+     *
+     * @return the keyVaultSecretRef value
+     */
+    public KeyVaultSecretRef keyVaultSecretRef() {
+        return this.keyVaultSecretRef;
+    }
+
+    /**
+     * Set reference to a secret stored in Azure Key Vault.
+     *
+     * @param keyVaultSecretRef the keyVaultSecretRef value to set
+     * @return the ContainerServiceServicePrincipalProfile object itself.
+     */
+    public ContainerServiceServicePrincipalProfile withKeyVaultSecretRef(KeyVaultSecretRef keyVaultSecretRef) {
+        this.keyVaultSecretRef = keyVaultSecretRef;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshConfiguration.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshConfiguration.java
new file mode 100644
index 000000000000..3f52592de853
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshConfiguration.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.containerservice.v2019_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SSH configuration for Linux-based VMs running on Azure.
+ */
+public class ContainerServiceSshConfiguration {
+    /**
+     * The list of SSH public keys used to authenticate with Linux-based VMs.
+     * Only expect one key specified.
+     */
+    @JsonProperty(value = "publicKeys", required = true)
+    private List<ContainerServiceSshPublicKey> publicKeys;
+
+    /**
+     * Get the list of SSH public keys used to authenticate with Linux-based VMs. Only expect one key specified.
+     *
+     * @return the publicKeys value
+     */
+    public List<ContainerServiceSshPublicKey> publicKeys() {
+        return this.publicKeys;
+    }
+
+    /**
+     * Set the list of SSH public keys used to authenticate with Linux-based VMs. Only expect one key specified.
+     *
+     * @param publicKeys the publicKeys value to set
+     * @return the ContainerServiceSshConfiguration object itself.
+     */
+    public ContainerServiceSshConfiguration withPublicKeys(List<ContainerServiceSshPublicKey> publicKeys) {
+        this.publicKeys = publicKeys;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshPublicKey.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshPublicKey.java
new file mode 100644
index 000000000000..4162476277a2
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceSshPublicKey.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains information about SSH certificate public key data.
+ */
+public class ContainerServiceSshPublicKey {
+    /**
+     * Certificate public key used to authenticate with VMs through SSH. The
+     * certificate must be in PEM format with or without headers.
+     */
+    @JsonProperty(value = "keyData", required = true)
+    private String keyData;
+
+    /**
+     * Get certificate public key used to authenticate with VMs through SSH. The certificate must be in PEM format with or without headers.
+     *
+     * @return the keyData value
+     */
+    public String keyData() {
+        return this.keyData;
+    }
+
+    /**
+     * Set certificate public key used to authenticate with VMs through SSH. The certificate must be in PEM format with or without headers.
+     *
+     * @param keyData the keyData value to set
+     * @return the ContainerServiceSshPublicKey object itself.
+     */
+    public ContainerServiceSshPublicKey withKeyData(String keyData) {
+        this.keyData = keyData;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceStorageProfileTypes.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceStorageProfileTypes.java
new file mode 100644
index 000000000000..0ae21ecbd324
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceStorageProfileTypes.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ContainerServiceStorageProfileTypes.
+ */
+public final class ContainerServiceStorageProfileTypes extends ExpandableStringEnum<ContainerServiceStorageProfileTypes> {
+    /** Static value StorageAccount for ContainerServiceStorageProfileTypes. */
+    public static final ContainerServiceStorageProfileTypes STORAGE_ACCOUNT = fromString("StorageAccount");
+
+    /** Static value ManagedDisks for ContainerServiceStorageProfileTypes. */
+    public static final ContainerServiceStorageProfileTypes MANAGED_DISKS = fromString("ManagedDisks");
+
+    /**
+     * Creates or finds a ContainerServiceStorageProfileTypes from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ContainerServiceStorageProfileTypes
+     */
+    @JsonCreator
+    public static ContainerServiceStorageProfileTypes fromString(String name) {
+        return fromString(name, ContainerServiceStorageProfileTypes.class);
+    }
+
+    /**
+     * @return known ContainerServiceStorageProfileTypes values
+     */
+    public static Collection<ContainerServiceStorageProfileTypes> values() {
+        return values(ContainerServiceStorageProfileTypes.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMDiagnostics.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMDiagnostics.java
new file mode 100644
index 000000000000..27251f9466fb
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMDiagnostics.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for diagnostics on the container service VMs.
+ */
+public class ContainerServiceVMDiagnostics {
+    /**
+     * Whether the VM diagnostic agent is provisioned on the VM.
+     */
+    @JsonProperty(value = "enabled", required = true)
+    private boolean enabled;
+
+    /**
+     * The URI of the storage account where diagnostics are stored.
+     */
+    @JsonProperty(value = "storageUri", access = JsonProperty.Access.WRITE_ONLY)
+    private String storageUri;
+
+    /**
+     * Get whether the VM diagnostic agent is provisioned on the VM.
+     *
+     * @return the enabled value
+     */
+    public boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set whether the VM diagnostic agent is provisioned on the VM.
+     *
+     * @param enabled the enabled value to set
+     * @return the ContainerServiceVMDiagnostics object itself.
+     */
+    public ContainerServiceVMDiagnostics withEnabled(boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the URI of the storage account where diagnostics are stored.
+     *
+     * @return the storageUri value
+     */
+    public String storageUri() {
+        return this.storageUri;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMSizeTypes.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMSizeTypes.java
new file mode 100644
index 000000000000..51a456053b13
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceVMSizeTypes.java
@@ -0,0 +1,557 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ContainerServiceVMSizeTypes.
+ */
+public final class ContainerServiceVMSizeTypes extends ExpandableStringEnum<ContainerServiceVMSizeTypes> {
+    /** Static value Standard_A1 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A1 = fromString("Standard_A1");
+
+    /** Static value Standard_A10 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A10 = fromString("Standard_A10");
+
+    /** Static value Standard_A11 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A11 = fromString("Standard_A11");
+
+    /** Static value Standard_A1_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A1_V2 = fromString("Standard_A1_v2");
+
+    /** Static value Standard_A2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A2 = fromString("Standard_A2");
+
+    /** Static value Standard_A2_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A2_V2 = fromString("Standard_A2_v2");
+
+    /** Static value Standard_A2m_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A2M_V2 = fromString("Standard_A2m_v2");
+
+    /** Static value Standard_A3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A3 = fromString("Standard_A3");
+
+    /** Static value Standard_A4 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A4 = fromString("Standard_A4");
+
+    /** Static value Standard_A4_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A4_V2 = fromString("Standard_A4_v2");
+
+    /** Static value Standard_A4m_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A4M_V2 = fromString("Standard_A4m_v2");
+
+    /** Static value Standard_A5 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A5 = fromString("Standard_A5");
+
+    /** Static value Standard_A6 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A6 = fromString("Standard_A6");
+
+    /** Static value Standard_A7 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A7 = fromString("Standard_A7");
+
+    /** Static value Standard_A8 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A8 = fromString("Standard_A8");
+
+    /** Static value Standard_A8_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A8_V2 = fromString("Standard_A8_v2");
+
+    /** Static value Standard_A8m_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A8M_V2 = fromString("Standard_A8m_v2");
+
+    /** Static value Standard_A9 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_A9 = fromString("Standard_A9");
+
+    /** Static value Standard_B2ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_B2MS = fromString("Standard_B2ms");
+
+    /** Static value Standard_B2s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_B2S = fromString("Standard_B2s");
+
+    /** Static value Standard_B4ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_B4MS = fromString("Standard_B4ms");
+
+    /** Static value Standard_B8ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_B8MS = fromString("Standard_B8ms");
+
+    /** Static value Standard_D1 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D1 = fromString("Standard_D1");
+
+    /** Static value Standard_D11 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D11 = fromString("Standard_D11");
+
+    /** Static value Standard_D11_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D11_V2 = fromString("Standard_D11_v2");
+
+    /** Static value Standard_D11_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D11_V2_PROMO = fromString("Standard_D11_v2_Promo");
+
+    /** Static value Standard_D12 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D12 = fromString("Standard_D12");
+
+    /** Static value Standard_D12_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D12_V2 = fromString("Standard_D12_v2");
+
+    /** Static value Standard_D12_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D12_V2_PROMO = fromString("Standard_D12_v2_Promo");
+
+    /** Static value Standard_D13 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D13 = fromString("Standard_D13");
+
+    /** Static value Standard_D13_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D13_V2 = fromString("Standard_D13_v2");
+
+    /** Static value Standard_D13_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D13_V2_PROMO = fromString("Standard_D13_v2_Promo");
+
+    /** Static value Standard_D14 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D14 = fromString("Standard_D14");
+
+    /** Static value Standard_D14_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D14_V2 = fromString("Standard_D14_v2");
+
+    /** Static value Standard_D14_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D14_V2_PROMO = fromString("Standard_D14_v2_Promo");
+
+    /** Static value Standard_D15_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D15_V2 = fromString("Standard_D15_v2");
+
+    /** Static value Standard_D16_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D16_V3 = fromString("Standard_D16_v3");
+
+    /** Static value Standard_D16s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D16S_V3 = fromString("Standard_D16s_v3");
+
+    /** Static value Standard_D1_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D1_V2 = fromString("Standard_D1_v2");
+
+    /** Static value Standard_D2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D2 = fromString("Standard_D2");
+
+    /** Static value Standard_D2_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D2_V2 = fromString("Standard_D2_v2");
+
+    /** Static value Standard_D2_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D2_V2_PROMO = fromString("Standard_D2_v2_Promo");
+
+    /** Static value Standard_D2_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D2_V3 = fromString("Standard_D2_v3");
+
+    /** Static value Standard_D2s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D2S_V3 = fromString("Standard_D2s_v3");
+
+    /** Static value Standard_D3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D3 = fromString("Standard_D3");
+
+    /** Static value Standard_D32_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D32_V3 = fromString("Standard_D32_v3");
+
+    /** Static value Standard_D32s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D32S_V3 = fromString("Standard_D32s_v3");
+
+    /** Static value Standard_D3_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D3_V2 = fromString("Standard_D3_v2");
+
+    /** Static value Standard_D3_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D3_V2_PROMO = fromString("Standard_D3_v2_Promo");
+
+    /** Static value Standard_D4 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D4 = fromString("Standard_D4");
+
+    /** Static value Standard_D4_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D4_V2 = fromString("Standard_D4_v2");
+
+    /** Static value Standard_D4_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D4_V2_PROMO = fromString("Standard_D4_v2_Promo");
+
+    /** Static value Standard_D4_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D4_V3 = fromString("Standard_D4_v3");
+
+    /** Static value Standard_D4s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D4S_V3 = fromString("Standard_D4s_v3");
+
+    /** Static value Standard_D5_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D5_V2 = fromString("Standard_D5_v2");
+
+    /** Static value Standard_D5_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D5_V2_PROMO = fromString("Standard_D5_v2_Promo");
+
+    /** Static value Standard_D64_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D64_V3 = fromString("Standard_D64_v3");
+
+    /** Static value Standard_D64s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D64S_V3 = fromString("Standard_D64s_v3");
+
+    /** Static value Standard_D8_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D8_V3 = fromString("Standard_D8_v3");
+
+    /** Static value Standard_D8s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_D8S_V3 = fromString("Standard_D8s_v3");
+
+    /** Static value Standard_DS1 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS1 = fromString("Standard_DS1");
+
+    /** Static value Standard_DS11 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS11 = fromString("Standard_DS11");
+
+    /** Static value Standard_DS11_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS11_V2 = fromString("Standard_DS11_v2");
+
+    /** Static value Standard_DS11_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS11_V2_PROMO = fromString("Standard_DS11_v2_Promo");
+
+    /** Static value Standard_DS12 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS12 = fromString("Standard_DS12");
+
+    /** Static value Standard_DS12_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS12_V2 = fromString("Standard_DS12_v2");
+
+    /** Static value Standard_DS12_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS12_V2_PROMO = fromString("Standard_DS12_v2_Promo");
+
+    /** Static value Standard_DS13 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS13 = fromString("Standard_DS13");
+
+    /** Static value Standard_DS13-2_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS13_2_V2 = fromString("Standard_DS13-2_v2");
+
+    /** Static value Standard_DS13-4_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS13_4_V2 = fromString("Standard_DS13-4_v2");
+
+    /** Static value Standard_DS13_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS13_V2 = fromString("Standard_DS13_v2");
+
+    /** Static value Standard_DS13_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS13_V2_PROMO = fromString("Standard_DS13_v2_Promo");
+
+    /** Static value Standard_DS14 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS14 = fromString("Standard_DS14");
+
+    /** Static value Standard_DS14-4_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS14_4_V2 = fromString("Standard_DS14-4_v2");
+
+    /** Static value Standard_DS14-8_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS14_8_V2 = fromString("Standard_DS14-8_v2");
+
+    /** Static value Standard_DS14_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS14_V2 = fromString("Standard_DS14_v2");
+
+    /** Static value Standard_DS14_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS14_V2_PROMO = fromString("Standard_DS14_v2_Promo");
+
+    /** Static value Standard_DS15_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS15_V2 = fromString("Standard_DS15_v2");
+
+    /** Static value Standard_DS1_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS1_V2 = fromString("Standard_DS1_v2");
+
+    /** Static value Standard_DS2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS2 = fromString("Standard_DS2");
+
+    /** Static value Standard_DS2_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS2_V2 = fromString("Standard_DS2_v2");
+
+    /** Static value Standard_DS2_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS2_V2_PROMO = fromString("Standard_DS2_v2_Promo");
+
+    /** Static value Standard_DS3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS3 = fromString("Standard_DS3");
+
+    /** Static value Standard_DS3_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS3_V2 = fromString("Standard_DS3_v2");
+
+    /** Static value Standard_DS3_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS3_V2_PROMO = fromString("Standard_DS3_v2_Promo");
+
+    /** Static value Standard_DS4 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS4 = fromString("Standard_DS4");
+
+    /** Static value Standard_DS4_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS4_V2 = fromString("Standard_DS4_v2");
+
+    /** Static value Standard_DS4_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS4_V2_PROMO = fromString("Standard_DS4_v2_Promo");
+
+    /** Static value Standard_DS5_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS5_V2 = fromString("Standard_DS5_v2");
+
+    /** Static value Standard_DS5_v2_Promo for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_DS5_V2_PROMO = fromString("Standard_DS5_v2_Promo");
+
+    /** Static value Standard_E16_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E16_V3 = fromString("Standard_E16_v3");
+
+    /** Static value Standard_E16s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E16S_V3 = fromString("Standard_E16s_v3");
+
+    /** Static value Standard_E2_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E2_V3 = fromString("Standard_E2_v3");
+
+    /** Static value Standard_E2s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E2S_V3 = fromString("Standard_E2s_v3");
+
+    /** Static value Standard_E32-16s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E32_16S_V3 = fromString("Standard_E32-16s_v3");
+
+    /** Static value Standard_E32-8s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E32_8S_V3 = fromString("Standard_E32-8s_v3");
+
+    /** Static value Standard_E32_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E32_V3 = fromString("Standard_E32_v3");
+
+    /** Static value Standard_E32s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E32S_V3 = fromString("Standard_E32s_v3");
+
+    /** Static value Standard_E4_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E4_V3 = fromString("Standard_E4_v3");
+
+    /** Static value Standard_E4s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E4S_V3 = fromString("Standard_E4s_v3");
+
+    /** Static value Standard_E64-16s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E64_16S_V3 = fromString("Standard_E64-16s_v3");
+
+    /** Static value Standard_E64-32s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E64_32S_V3 = fromString("Standard_E64-32s_v3");
+
+    /** Static value Standard_E64_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E64_V3 = fromString("Standard_E64_v3");
+
+    /** Static value Standard_E64s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E64S_V3 = fromString("Standard_E64s_v3");
+
+    /** Static value Standard_E8_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E8_V3 = fromString("Standard_E8_v3");
+
+    /** Static value Standard_E8s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_E8S_V3 = fromString("Standard_E8s_v3");
+
+    /** Static value Standard_F1 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F1 = fromString("Standard_F1");
+
+    /** Static value Standard_F16 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F16 = fromString("Standard_F16");
+
+    /** Static value Standard_F16s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F16S = fromString("Standard_F16s");
+
+    /** Static value Standard_F16s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F16S_V2 = fromString("Standard_F16s_v2");
+
+    /** Static value Standard_F1s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F1S = fromString("Standard_F1s");
+
+    /** Static value Standard_F2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F2 = fromString("Standard_F2");
+
+    /** Static value Standard_F2s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F2S = fromString("Standard_F2s");
+
+    /** Static value Standard_F2s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F2S_V2 = fromString("Standard_F2s_v2");
+
+    /** Static value Standard_F32s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F32S_V2 = fromString("Standard_F32s_v2");
+
+    /** Static value Standard_F4 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F4 = fromString("Standard_F4");
+
+    /** Static value Standard_F4s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F4S = fromString("Standard_F4s");
+
+    /** Static value Standard_F4s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F4S_V2 = fromString("Standard_F4s_v2");
+
+    /** Static value Standard_F64s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F64S_V2 = fromString("Standard_F64s_v2");
+
+    /** Static value Standard_F72s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F72S_V2 = fromString("Standard_F72s_v2");
+
+    /** Static value Standard_F8 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F8 = fromString("Standard_F8");
+
+    /** Static value Standard_F8s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F8S = fromString("Standard_F8s");
+
+    /** Static value Standard_F8s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_F8S_V2 = fromString("Standard_F8s_v2");
+
+    /** Static value Standard_G1 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_G1 = fromString("Standard_G1");
+
+    /** Static value Standard_G2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_G2 = fromString("Standard_G2");
+
+    /** Static value Standard_G3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_G3 = fromString("Standard_G3");
+
+    /** Static value Standard_G4 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_G4 = fromString("Standard_G4");
+
+    /** Static value Standard_G5 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_G5 = fromString("Standard_G5");
+
+    /** Static value Standard_GS1 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS1 = fromString("Standard_GS1");
+
+    /** Static value Standard_GS2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS2 = fromString("Standard_GS2");
+
+    /** Static value Standard_GS3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS3 = fromString("Standard_GS3");
+
+    /** Static value Standard_GS4 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS4 = fromString("Standard_GS4");
+
+    /** Static value Standard_GS4-4 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS4_4 = fromString("Standard_GS4-4");
+
+    /** Static value Standard_GS4-8 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS4_8 = fromString("Standard_GS4-8");
+
+    /** Static value Standard_GS5 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS5 = fromString("Standard_GS5");
+
+    /** Static value Standard_GS5-16 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS5_16 = fromString("Standard_GS5-16");
+
+    /** Static value Standard_GS5-8 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_GS5_8 = fromString("Standard_GS5-8");
+
+    /** Static value Standard_H16 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_H16 = fromString("Standard_H16");
+
+    /** Static value Standard_H16m for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_H16M = fromString("Standard_H16m");
+
+    /** Static value Standard_H16mr for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_H16MR = fromString("Standard_H16mr");
+
+    /** Static value Standard_H16r for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_H16R = fromString("Standard_H16r");
+
+    /** Static value Standard_H8 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_H8 = fromString("Standard_H8");
+
+    /** Static value Standard_H8m for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_H8M = fromString("Standard_H8m");
+
+    /** Static value Standard_L16s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_L16S = fromString("Standard_L16s");
+
+    /** Static value Standard_L32s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_L32S = fromString("Standard_L32s");
+
+    /** Static value Standard_L4s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_L4S = fromString("Standard_L4s");
+
+    /** Static value Standard_L8s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_L8S = fromString("Standard_L8s");
+
+    /** Static value Standard_M128-32ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M128_32MS = fromString("Standard_M128-32ms");
+
+    /** Static value Standard_M128-64ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M128_64MS = fromString("Standard_M128-64ms");
+
+    /** Static value Standard_M128ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M128MS = fromString("Standard_M128ms");
+
+    /** Static value Standard_M128s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M128S = fromString("Standard_M128s");
+
+    /** Static value Standard_M64-16ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M64_16MS = fromString("Standard_M64-16ms");
+
+    /** Static value Standard_M64-32ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M64_32MS = fromString("Standard_M64-32ms");
+
+    /** Static value Standard_M64ms for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M64MS = fromString("Standard_M64ms");
+
+    /** Static value Standard_M64s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_M64S = fromString("Standard_M64s");
+
+    /** Static value Standard_NC12 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC12 = fromString("Standard_NC12");
+
+    /** Static value Standard_NC12s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC12S_V2 = fromString("Standard_NC12s_v2");
+
+    /** Static value Standard_NC12s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC12S_V3 = fromString("Standard_NC12s_v3");
+
+    /** Static value Standard_NC24 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC24 = fromString("Standard_NC24");
+
+    /** Static value Standard_NC24r for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC24R = fromString("Standard_NC24r");
+
+    /** Static value Standard_NC24rs_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC24RS_V2 = fromString("Standard_NC24rs_v2");
+
+    /** Static value Standard_NC24rs_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC24RS_V3 = fromString("Standard_NC24rs_v3");
+
+    /** Static value Standard_NC24s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC24S_V2 = fromString("Standard_NC24s_v2");
+
+    /** Static value Standard_NC24s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC24S_V3 = fromString("Standard_NC24s_v3");
+
+    /** Static value Standard_NC6 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC6 = fromString("Standard_NC6");
+
+    /** Static value Standard_NC6s_v2 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC6S_V2 = fromString("Standard_NC6s_v2");
+
+    /** Static value Standard_NC6s_v3 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NC6S_V3 = fromString("Standard_NC6s_v3");
+
+    /** Static value Standard_ND12s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_ND12S = fromString("Standard_ND12s");
+
+    /** Static value Standard_ND24rs for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_ND24RS = fromString("Standard_ND24rs");
+
+    /** Static value Standard_ND24s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_ND24S = fromString("Standard_ND24s");
+
+    /** Static value Standard_ND6s for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_ND6S = fromString("Standard_ND6s");
+
+    /** Static value Standard_NV12 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NV12 = fromString("Standard_NV12");
+
+    /** Static value Standard_NV24 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NV24 = fromString("Standard_NV24");
+
+    /** Static value Standard_NV6 for ContainerServiceVMSizeTypes. */
+    public static final ContainerServiceVMSizeTypes STANDARD_NV6 = fromString("Standard_NV6");
+
+    /**
+     * Creates or finds a ContainerServiceVMSizeTypes from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ContainerServiceVMSizeTypes
+     */
+    @JsonCreator
+    public static ContainerServiceVMSizeTypes fromString(String name) {
+        return fromString(name, ContainerServiceVMSizeTypes.class);
+    }
+
+    /**
+     * @return known ContainerServiceVMSizeTypes values
+     */
+    public static Collection<ContainerServiceVMSizeTypes> values() {
+        return values(ContainerServiceVMSizeTypes.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceWindowsProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceWindowsProfile.java
new file mode 100644
index 000000000000..ff8f03821580
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServiceWindowsProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for Windows VMs in the container service cluster.
+ */
+public class ContainerServiceWindowsProfile {
+    /**
+     * The administrator username to use for Windows VMs.
+     */
+    @JsonProperty(value = "adminUsername", required = true)
+    private String adminUsername;
+
+    /**
+     * The administrator password to use for Windows VMs.
+     */
+    @JsonProperty(value = "adminPassword", required = true)
+    private String adminPassword;
+
+    /**
+     * Get the administrator username to use for Windows VMs.
+     *
+     * @return the adminUsername value
+     */
+    public String adminUsername() {
+        return this.adminUsername;
+    }
+
+    /**
+     * Set the administrator username to use for Windows VMs.
+     *
+     * @param adminUsername the adminUsername value to set
+     * @return the ContainerServiceWindowsProfile object itself.
+     */
+    public ContainerServiceWindowsProfile withAdminUsername(String adminUsername) {
+        this.adminUsername = adminUsername;
+        return this;
+    }
+
+    /**
+     * Get the administrator password to use for Windows VMs.
+     *
+     * @return the adminPassword value
+     */
+    public String adminPassword() {
+        return this.adminPassword;
+    }
+
+    /**
+     * Set the administrator password to use for Windows VMs.
+     *
+     * @param adminPassword the adminPassword value to set
+     * @return the ContainerServiceWindowsProfile object itself.
+     */
+    public ContainerServiceWindowsProfile withAdminPassword(String adminPassword) {
+        this.adminPassword = adminPassword;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServices.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServices.java
new file mode 100644
index 000000000000..d22e75bd7c01
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ContainerServices.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.containerservice.v2019_06_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.containerservice.v2019_06_01.implementation.ContainerServicesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ContainerServices.
+ */
+public interface ContainerServices extends SupportsCreating<ContainerService.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ContainerService>, SupportsListingByResourceGroup<ContainerService>, SupportsListing<ContainerService>, HasInner<ContainerServicesInner> {
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<OrchestratorVersionProfileListResult> listOrchestratorsAsync(String location);
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResult.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResult.java
new file mode 100644
index 000000000000..a623988dbd19
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResult.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The credential result response.
+ */
+public class CredentialResult {
+    /**
+     * The name of the credential.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Base64-encoded Kubernetes configuration file.
+     */
+    @JsonProperty(value = "value", access = JsonProperty.Access.WRITE_ONLY)
+    private byte[] value;
+
+    /**
+     * Get the name of the credential.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get base64-encoded Kubernetes configuration file.
+     *
+     * @return the value value
+     */
+    public byte[] value() {
+        return this.value;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResults.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResults.java
new file mode 100644
index 000000000000..4e7650f1c4d3
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/CredentialResults.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.CredentialResultsInner;
+import java.util.List;
+
+/**
+ * Type representing CredentialResults.
+ */
+public interface CredentialResults extends HasInner<CredentialResultsInner>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the kubeconfigs value.
+     */
+    List<CredentialResult> kubeconfigs();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/KeyVaultSecretRef.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/KeyVaultSecretRef.java
new file mode 100644
index 000000000000..fb2be62d6c6f
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/KeyVaultSecretRef.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Reference to a secret stored in Azure Key Vault.
+ */
+public class KeyVaultSecretRef {
+    /**
+     * Key vault identifier.
+     */
+    @JsonProperty(value = "vaultID", required = true)
+    private String vaultID;
+
+    /**
+     * The secret name.
+     */
+    @JsonProperty(value = "secretName", required = true)
+    private String secretName;
+
+    /**
+     * The secret version.
+     */
+    @JsonProperty(value = "version")
+    private String version;
+
+    /**
+     * Get key vault identifier.
+     *
+     * @return the vaultID value
+     */
+    public String vaultID() {
+        return this.vaultID;
+    }
+
+    /**
+     * Set key vault identifier.
+     *
+     * @param vaultID the vaultID value to set
+     * @return the KeyVaultSecretRef object itself.
+     */
+    public KeyVaultSecretRef withVaultID(String vaultID) {
+        this.vaultID = vaultID;
+        return this;
+    }
+
+    /**
+     * Get the secret name.
+     *
+     * @return the secretName value
+     */
+    public String secretName() {
+        return this.secretName;
+    }
+
+    /**
+     * Set the secret name.
+     *
+     * @param secretName the secretName value to set
+     * @return the KeyVaultSecretRef object itself.
+     */
+    public KeyVaultSecretRef withSecretName(String secretName) {
+        this.secretName = secretName;
+        return this;
+    }
+
+    /**
+     * Get the secret version.
+     *
+     * @return the version value
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the secret version.
+     *
+     * @param version the version value to set
+     * @return the KeyVaultSecretRef object itself.
+     */
+    public KeyVaultSecretRef withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/LoadBalancerSku.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/LoadBalancerSku.java
new file mode 100644
index 000000000000..d1f30b88a035
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/LoadBalancerSku.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for LoadBalancerSku.
+ */
+public final class LoadBalancerSku extends ExpandableStringEnum<LoadBalancerSku> {
+    /** Static value standard for LoadBalancerSku. */
+    public static final LoadBalancerSku STANDARD = fromString("standard");
+
+    /** Static value basic for LoadBalancerSku. */
+    public static final LoadBalancerSku BASIC = fromString("basic");
+
+    /**
+     * Creates or finds a LoadBalancerSku from its string representation.
+     * @param name a name to look for
+     * @return the corresponding LoadBalancerSku
+     */
+    @JsonCreator
+    public static LoadBalancerSku fromString(String name) {
+        return fromString(name, LoadBalancerSku.class);
+    }
+
+    /**
+     * @return known LoadBalancerSku values
+     */
+    public static Collection<LoadBalancerSku> values() {
+        return values(LoadBalancerSku.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedCluster.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedCluster.java
new file mode 100644
index 000000000000..687f5854a321
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedCluster.java
@@ -0,0 +1,491 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_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.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import java.util.List;
+import java.util.Map;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ManagedClusterInner;
+
+/**
+ * Type representing ManagedCluster.
+ */
+public interface ManagedCluster extends HasInner<ManagedClusterInner>, Resource, GroupableResourceCore<ContainerServiceManager, ManagedClusterInner>, HasResourceGroup, Refreshable<ManagedCluster>, Updatable<ManagedCluster.Update>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the aadProfile value.
+     */
+    ManagedClusterAADProfile aadProfile();
+
+    /**
+     * @return the addonProfiles value.
+     */
+    Map<String, ManagedClusterAddonProfile> addonProfiles();
+
+    /**
+     * @return the agentPoolProfiles value.
+     */
+    List<ManagedClusterAgentPoolProfile> agentPoolProfiles();
+
+    /**
+     * @return the apiServerAuthorizedIPRanges value.
+     */
+    List<String> apiServerAuthorizedIPRanges();
+
+    /**
+     * @return the dnsPrefix value.
+     */
+    String dnsPrefix();
+
+    /**
+     * @return the enablePodSecurityPolicy value.
+     */
+    Boolean enablePodSecurityPolicy();
+
+    /**
+     * @return the enableRBAC value.
+     */
+    Boolean enableRBAC();
+
+    /**
+     * @return the fqdn value.
+     */
+    String fqdn();
+
+    /**
+     * @return the identity value.
+     */
+    ManagedClusterIdentity identity();
+
+    /**
+     * @return the kubernetesVersion value.
+     */
+    String kubernetesVersion();
+
+    /**
+     * @return the linuxProfile value.
+     */
+    ContainerServiceLinuxProfile linuxProfile();
+
+    /**
+     * @return the maxAgentPools value.
+     */
+    Integer maxAgentPools();
+
+    /**
+     * @return the networkProfile value.
+     */
+    ContainerServiceNetworkProfile networkProfile();
+
+    /**
+     * @return the nodeResourceGroup value.
+     */
+    String nodeResourceGroup();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the servicePrincipalProfile value.
+     */
+    ManagedClusterServicePrincipalProfile servicePrincipalProfile();
+
+    /**
+     * @return the windowsProfile value.
+     */
+    ManagedClusterWindowsProfile windowsProfile();
+
+    /**
+     * The entirety of the ManagedCluster definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ManagedCluster definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ManagedCluster definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the ManagedCluster definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify AadProfile.
+         */
+        interface WithAadProfile {
+            /**
+             * Specifies aadProfile.
+             * @param aadProfile Profile of Azure Active Directory configuration
+             * @return the next definition stage
+             */
+            WithCreate withAadProfile(ManagedClusterAADProfile aadProfile);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify AddonProfiles.
+         */
+        interface WithAddonProfiles {
+            /**
+             * Specifies addonProfiles.
+             * @param addonProfiles Profile of managed cluster add-on
+             * @return the next definition stage
+             */
+            WithCreate withAddonProfiles(Map<String, ManagedClusterAddonProfile> addonProfiles);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify AgentPoolProfiles.
+         */
+        interface WithAgentPoolProfiles {
+            /**
+             * Specifies agentPoolProfiles.
+             * @param agentPoolProfiles Properties of the agent pool
+             * @return the next definition stage
+             */
+            WithCreate withAgentPoolProfiles(List<ManagedClusterAgentPoolProfile> agentPoolProfiles);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify ApiServerAuthorizedIPRanges.
+         */
+        interface WithApiServerAuthorizedIPRanges {
+            /**
+             * Specifies apiServerAuthorizedIPRanges.
+             * @param apiServerAuthorizedIPRanges (PREVIEW) Authorized IP Ranges to kubernetes API server
+             * @return the next definition stage
+             */
+            WithCreate withApiServerAuthorizedIPRanges(List<String> apiServerAuthorizedIPRanges);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify DnsPrefix.
+         */
+        interface WithDnsPrefix {
+            /**
+             * Specifies dnsPrefix.
+             * @param dnsPrefix DNS prefix specified when creating the managed cluster
+             * @return the next definition stage
+             */
+            WithCreate withDnsPrefix(String dnsPrefix);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify EnablePodSecurityPolicy.
+         */
+        interface WithEnablePodSecurityPolicy {
+            /**
+             * Specifies enablePodSecurityPolicy.
+             * @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
+             * @return the next definition stage
+             */
+            WithCreate withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify EnableRBAC.
+         */
+        interface WithEnableRBAC {
+            /**
+             * Specifies enableRBAC.
+             * @param enableRBAC Whether to enable Kubernetes Role-Based Access Control
+             * @return the next definition stage
+             */
+            WithCreate withEnableRBAC(Boolean enableRBAC);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of the managed cluster, if configured
+             * @return the next definition stage
+             */
+            WithCreate withIdentity(ManagedClusterIdentity identity);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify KubernetesVersion.
+         */
+        interface WithKubernetesVersion {
+            /**
+             * Specifies kubernetesVersion.
+             * @param kubernetesVersion Version of Kubernetes specified when creating the managed cluster
+             * @return the next definition stage
+             */
+            WithCreate withKubernetesVersion(String kubernetesVersion);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify LinuxProfile.
+         */
+        interface WithLinuxProfile {
+            /**
+             * Specifies linuxProfile.
+             * @param linuxProfile Profile for Linux VMs in the container service cluster
+             * @return the next definition stage
+             */
+            WithCreate withLinuxProfile(ContainerServiceLinuxProfile linuxProfile);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify NetworkProfile.
+         */
+        interface WithNetworkProfile {
+            /**
+             * Specifies networkProfile.
+             * @param networkProfile Profile of network configuration
+             * @return the next definition stage
+             */
+            WithCreate withNetworkProfile(ContainerServiceNetworkProfile networkProfile);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify NodeResourceGroup.
+         */
+        interface WithNodeResourceGroup {
+            /**
+             * Specifies nodeResourceGroup.
+             * @param nodeResourceGroup Name of the resource group containing agent pool nodes
+             * @return the next definition stage
+             */
+            WithCreate withNodeResourceGroup(String nodeResourceGroup);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify ServicePrincipalProfile.
+         */
+        interface WithServicePrincipalProfile {
+            /**
+             * Specifies servicePrincipalProfile.
+             * @param servicePrincipalProfile Information about a service principal identity for the cluster to use for manipulating Azure APIs
+             * @return the next definition stage
+             */
+            WithCreate withServicePrincipalProfile(ManagedClusterServicePrincipalProfile servicePrincipalProfile);
+        }
+
+        /**
+         * The stage of the managedcluster definition allowing to specify WindowsProfile.
+         */
+        interface WithWindowsProfile {
+            /**
+             * Specifies windowsProfile.
+             * @param windowsProfile Profile for Windows VMs in the container service cluster
+             * @return the next definition stage
+             */
+            WithCreate withWindowsProfile(ManagedClusterWindowsProfile windowsProfile);
+        }
+
+        /**
+         * 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<ManagedCluster>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAadProfile, DefinitionStages.WithAddonProfiles, DefinitionStages.WithAgentPoolProfiles, DefinitionStages.WithApiServerAuthorizedIPRanges, DefinitionStages.WithDnsPrefix, DefinitionStages.WithEnablePodSecurityPolicy, DefinitionStages.WithEnableRBAC, DefinitionStages.WithIdentity, DefinitionStages.WithKubernetesVersion, DefinitionStages.WithLinuxProfile, DefinitionStages.WithNetworkProfile, DefinitionStages.WithNodeResourceGroup, DefinitionStages.WithServicePrincipalProfile, DefinitionStages.WithWindowsProfile {
+        }
+    }
+    /**
+     * The template for a ManagedCluster update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ManagedCluster>, Resource.UpdateWithTags<Update>, UpdateStages.WithAadProfile, UpdateStages.WithAddonProfiles, UpdateStages.WithAgentPoolProfiles, UpdateStages.WithApiServerAuthorizedIPRanges, UpdateStages.WithDnsPrefix, UpdateStages.WithEnablePodSecurityPolicy, UpdateStages.WithEnableRBAC, UpdateStages.WithIdentity, UpdateStages.WithKubernetesVersion, UpdateStages.WithLinuxProfile, UpdateStages.WithNetworkProfile, UpdateStages.WithNodeResourceGroup, UpdateStages.WithServicePrincipalProfile, UpdateStages.WithWindowsProfile {
+    }
+
+    /**
+     * Grouping of ManagedCluster update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the managedcluster update allowing to specify AadProfile.
+         */
+        interface WithAadProfile {
+            /**
+             * Specifies aadProfile.
+             * @param aadProfile Profile of Azure Active Directory configuration
+             * @return the next update stage
+             */
+            Update withAadProfile(ManagedClusterAADProfile aadProfile);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify AddonProfiles.
+         */
+        interface WithAddonProfiles {
+            /**
+             * Specifies addonProfiles.
+             * @param addonProfiles Profile of managed cluster add-on
+             * @return the next update stage
+             */
+            Update withAddonProfiles(Map<String, ManagedClusterAddonProfile> addonProfiles);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify AgentPoolProfiles.
+         */
+        interface WithAgentPoolProfiles {
+            /**
+             * Specifies agentPoolProfiles.
+             * @param agentPoolProfiles Properties of the agent pool
+             * @return the next update stage
+             */
+            Update withAgentPoolProfiles(List<ManagedClusterAgentPoolProfile> agentPoolProfiles);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify ApiServerAuthorizedIPRanges.
+         */
+        interface WithApiServerAuthorizedIPRanges {
+            /**
+             * Specifies apiServerAuthorizedIPRanges.
+             * @param apiServerAuthorizedIPRanges (PREVIEW) Authorized IP Ranges to kubernetes API server
+             * @return the next update stage
+             */
+            Update withApiServerAuthorizedIPRanges(List<String> apiServerAuthorizedIPRanges);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify DnsPrefix.
+         */
+        interface WithDnsPrefix {
+            /**
+             * Specifies dnsPrefix.
+             * @param dnsPrefix DNS prefix specified when creating the managed cluster
+             * @return the next update stage
+             */
+            Update withDnsPrefix(String dnsPrefix);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify EnablePodSecurityPolicy.
+         */
+        interface WithEnablePodSecurityPolicy {
+            /**
+             * Specifies enablePodSecurityPolicy.
+             * @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
+             * @return the next update stage
+             */
+            Update withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify EnableRBAC.
+         */
+        interface WithEnableRBAC {
+            /**
+             * Specifies enableRBAC.
+             * @param enableRBAC Whether to enable Kubernetes Role-Based Access Control
+             * @return the next update stage
+             */
+            Update withEnableRBAC(Boolean enableRBAC);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             * @param identity The identity of the managed cluster, if configured
+             * @return the next update stage
+             */
+            Update withIdentity(ManagedClusterIdentity identity);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify KubernetesVersion.
+         */
+        interface WithKubernetesVersion {
+            /**
+             * Specifies kubernetesVersion.
+             * @param kubernetesVersion Version of Kubernetes specified when creating the managed cluster
+             * @return the next update stage
+             */
+            Update withKubernetesVersion(String kubernetesVersion);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify LinuxProfile.
+         */
+        interface WithLinuxProfile {
+            /**
+             * Specifies linuxProfile.
+             * @param linuxProfile Profile for Linux VMs in the container service cluster
+             * @return the next update stage
+             */
+            Update withLinuxProfile(ContainerServiceLinuxProfile linuxProfile);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify NetworkProfile.
+         */
+        interface WithNetworkProfile {
+            /**
+             * Specifies networkProfile.
+             * @param networkProfile Profile of network configuration
+             * @return the next update stage
+             */
+            Update withNetworkProfile(ContainerServiceNetworkProfile networkProfile);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify NodeResourceGroup.
+         */
+        interface WithNodeResourceGroup {
+            /**
+             * Specifies nodeResourceGroup.
+             * @param nodeResourceGroup Name of the resource group containing agent pool nodes
+             * @return the next update stage
+             */
+            Update withNodeResourceGroup(String nodeResourceGroup);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify ServicePrincipalProfile.
+         */
+        interface WithServicePrincipalProfile {
+            /**
+             * Specifies servicePrincipalProfile.
+             * @param servicePrincipalProfile Information about a service principal identity for the cluster to use for manipulating Azure APIs
+             * @return the next update stage
+             */
+            Update withServicePrincipalProfile(ManagedClusterServicePrincipalProfile servicePrincipalProfile);
+        }
+
+        /**
+         * The stage of the managedcluster update allowing to specify WindowsProfile.
+         */
+        interface WithWindowsProfile {
+            /**
+             * Specifies windowsProfile.
+             * @param windowsProfile Profile for Windows VMs in the container service cluster
+             * @return the next update stage
+             */
+            Update withWindowsProfile(ManagedClusterWindowsProfile windowsProfile);
+        }
+
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAADProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAADProfile.java
new file mode 100644
index 000000000000..dfa7ed7de73c
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAADProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * AADProfile specifies attributes for Azure Active Directory integration.
+ */
+public class ManagedClusterAADProfile {
+    /**
+     * The client AAD application ID.
+     */
+    @JsonProperty(value = "clientAppID", required = true)
+    private String clientAppID;
+
+    /**
+     * The server AAD application ID.
+     */
+    @JsonProperty(value = "serverAppID", required = true)
+    private String serverAppID;
+
+    /**
+     * The server AAD application secret.
+     */
+    @JsonProperty(value = "serverAppSecret")
+    private String serverAppSecret;
+
+    /**
+     * The AAD tenant ID to use for authentication. If not specified, will use
+     * the tenant of the deployment subscription.
+     */
+    @JsonProperty(value = "tenantID")
+    private String tenantID;
+
+    /**
+     * Get the client AAD application ID.
+     *
+     * @return the clientAppID value
+     */
+    public String clientAppID() {
+        return this.clientAppID;
+    }
+
+    /**
+     * Set the client AAD application ID.
+     *
+     * @param clientAppID the clientAppID value to set
+     * @return the ManagedClusterAADProfile object itself.
+     */
+    public ManagedClusterAADProfile withClientAppID(String clientAppID) {
+        this.clientAppID = clientAppID;
+        return this;
+    }
+
+    /**
+     * Get the server AAD application ID.
+     *
+     * @return the serverAppID value
+     */
+    public String serverAppID() {
+        return this.serverAppID;
+    }
+
+    /**
+     * Set the server AAD application ID.
+     *
+     * @param serverAppID the serverAppID value to set
+     * @return the ManagedClusterAADProfile object itself.
+     */
+    public ManagedClusterAADProfile withServerAppID(String serverAppID) {
+        this.serverAppID = serverAppID;
+        return this;
+    }
+
+    /**
+     * Get the server AAD application secret.
+     *
+     * @return the serverAppSecret value
+     */
+    public String serverAppSecret() {
+        return this.serverAppSecret;
+    }
+
+    /**
+     * Set the server AAD application secret.
+     *
+     * @param serverAppSecret the serverAppSecret value to set
+     * @return the ManagedClusterAADProfile object itself.
+     */
+    public ManagedClusterAADProfile withServerAppSecret(String serverAppSecret) {
+        this.serverAppSecret = serverAppSecret;
+        return this;
+    }
+
+    /**
+     * Get the AAD tenant ID to use for authentication. If not specified, will use the tenant of the deployment subscription.
+     *
+     * @return the tenantID value
+     */
+    public String tenantID() {
+        return this.tenantID;
+    }
+
+    /**
+     * Set the AAD tenant ID to use for authentication. If not specified, will use the tenant of the deployment subscription.
+     *
+     * @param tenantID the tenantID value to set
+     * @return the ManagedClusterAADProfile object itself.
+     */
+    public ManagedClusterAADProfile withTenantID(String tenantID) {
+        this.tenantID = tenantID;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAccessProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAccessProfile.java
new file mode 100644
index 000000000000..89b02450e8f7
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAccessProfile.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ManagedClusterAccessProfileInner;
+import java.util.Map;
+
+/**
+ * Type representing ManagedClusterAccessProfile.
+ */
+public interface ManagedClusterAccessProfile extends HasInner<ManagedClusterAccessProfileInner>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kubeConfig value.
+     */
+    byte[] kubeConfig();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAddonProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAddonProfile.java
new file mode 100644
index 000000000000..1d84bb594421
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAddonProfile.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.containerservice.v2019_06_01;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Kubernetes add-on profile for a managed cluster.
+ */
+public class ManagedClusterAddonProfile {
+    /**
+     * Whether the add-on is enabled or not.
+     */
+    @JsonProperty(value = "enabled", required = true)
+    private boolean enabled;
+
+    /**
+     * Key-value pairs for configuring an add-on.
+     */
+    @JsonProperty(value = "config")
+    private Map<String, String> config;
+
+    /**
+     * Get whether the add-on is enabled or not.
+     *
+     * @return the enabled value
+     */
+    public boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set whether the add-on is enabled or not.
+     *
+     * @param enabled the enabled value to set
+     * @return the ManagedClusterAddonProfile object itself.
+     */
+    public ManagedClusterAddonProfile withEnabled(boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get key-value pairs for configuring an add-on.
+     *
+     * @return the config value
+     */
+    public Map<String, String> config() {
+        return this.config;
+    }
+
+    /**
+     * Set key-value pairs for configuring an add-on.
+     *
+     * @param config the config value to set
+     * @return the ManagedClusterAddonProfile object itself.
+     */
+    public ManagedClusterAddonProfile withConfig(Map<String, String> config) {
+        this.config = config;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfile.java
new file mode 100644
index 000000000000..f5093d12fc74
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for the container service agent pool.
+ */
+public class ManagedClusterAgentPoolProfile extends ManagedClusterAgentPoolProfileProperties {
+    /**
+     * Unique name of the agent pool profile in the context of the subscription
+     * and resource group.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Get unique name of the agent pool profile in the context of the subscription and resource group.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set unique name of the agent pool profile in the context of the subscription and resource group.
+     *
+     * @param name the name value to set
+     * @return the ManagedClusterAgentPoolProfile object itself.
+     */
+    public ManagedClusterAgentPoolProfile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfileProperties.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfileProperties.java
new file mode 100644
index 000000000000..2a5cb3ffce51
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterAgentPoolProfileProperties.java
@@ -0,0 +1,511 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties for the container service agent pool profile.
+ */
+public class ManagedClusterAgentPoolProfileProperties {
+    /**
+     * Number of agents (VMs) to host docker containers. Allowed values must be
+     * in the range of 1 to 100 (inclusive). The default value is 1.
+     */
+    @JsonProperty(value = "count", required = true)
+    private int count;
+
+    /**
+     * Size of agent VMs. Possible values include: 'Standard_A1',
+     * 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
+     * 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
+     * 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
+     * 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
+     * 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
+     * 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
+     * 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
+     * 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
+     * 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
+     * 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
+     * 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
+     * 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
+     * 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
+     * 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
+     * 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
+     * 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
+     * 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
+     * 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo',
+     * 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
+     * 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2',
+     * 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14',
+     * 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2',
+     * 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
+     * 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo',
+     * 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo',
+     * 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
+     * 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3',
+     * 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3',
+     * 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3',
+     * 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
+     * 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3',
+     * 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1',
+     * 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s',
+     * 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2',
+     * 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
+     * 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2',
+     * 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4',
+     * 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3',
+     * 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
+     * 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m',
+     * 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m',
+     * 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s',
+     * 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
+     * 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms',
+     * 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2',
+     * 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
+     * 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2',
+     * 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2',
+     * 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
+     * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
+     * 'Standard_NV6'.
+     */
+    @JsonProperty(value = "vmSize", required = true)
+    private ContainerServiceVMSizeTypes vmSize;
+
+    /**
+     * OS Disk Size in GB to be used to specify the disk size for every machine
+     * in this master/agent pool. If you specify 0, it will apply the default
+     * osDisk size according to the vmSize specified.
+     */
+    @JsonProperty(value = "osDiskSizeGB")
+    private Integer osDiskSizeGB;
+
+    /**
+     * VNet SubnetID specifies the VNet's subnet identifier.
+     */
+    @JsonProperty(value = "vnetSubnetID")
+    private String vnetSubnetID;
+
+    /**
+     * Maximum number of pods that can run on a node.
+     */
+    @JsonProperty(value = "maxPods")
+    private Integer maxPods;
+
+    /**
+     * OsType to be used to specify os type. Choose from Linux and Windows.
+     * Default to Linux. Possible values include: 'Linux', 'Windows'.
+     */
+    @JsonProperty(value = "osType")
+    private OSType osType;
+
+    /**
+     * Maximum number of nodes for auto-scaling.
+     */
+    @JsonProperty(value = "maxCount")
+    private Integer maxCount;
+
+    /**
+     * Minimum number of nodes for auto-scaling.
+     */
+    @JsonProperty(value = "minCount")
+    private Integer minCount;
+
+    /**
+     * Whether to enable auto-scaler.
+     */
+    @JsonProperty(value = "enableAutoScaling")
+    private Boolean enableAutoScaling;
+
+    /**
+     * AgentPoolType represents types of an agent pool. Possible values
+     * include: 'VirtualMachineScaleSets', 'AvailabilitySet'.
+     */
+    @JsonProperty(value = "type")
+    private AgentPoolType type;
+
+    /**
+     * Version of orchestrator specified when creating the managed cluster.
+     */
+    @JsonProperty(value = "orchestratorVersion")
+    private String orchestratorVersion;
+
+    /**
+     * The current deployment or provisioning state, which only appears in the
+     * response.
+     */
+    @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets
+     * AgentPoolType.
+     */
+    @JsonProperty(value = "availabilityZones")
+    private List<String> availabilityZones;
+
+    /**
+     * Enable public IP for nodes.
+     */
+    @JsonProperty(value = "enableNodePublicIP")
+    private Boolean enableNodePublicIP;
+
+    /**
+     * ScaleSetPriority to be used to specify virtual machine scale set
+     * priority. Default to regular. Possible values include: 'Low', 'Regular'.
+     */
+    @JsonProperty(value = "scaleSetPriority")
+    private ScaleSetPriority scaleSetPriority;
+
+    /**
+     * ScaleSetEvictionPolicy to be used to specify eviction policy for low
+     * priority virtual machine scale set. Default to Delete. Possible values
+     * include: 'Delete', 'Deallocate'.
+     */
+    @JsonProperty(value = "scaleSetEvictionPolicy")
+    private ScaleSetEvictionPolicy scaleSetEvictionPolicy;
+
+    /**
+     * Taints added to new nodes during node pool create and scale. For
+     * example, key=value:NoSchedule.
+     */
+    @JsonProperty(value = "nodeTaints")
+    private List<String> nodeTaints;
+
+    /**
+     * Get number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
+     *
+     * @return the count value
+     */
+    public int count() {
+        return this.count;
+    }
+
+    /**
+     * Set number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
+     *
+     * @param count the count value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withCount(int count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @return the vmSize value
+     */
+    public ContainerServiceVMSizeTypes vmSize() {
+        return this.vmSize;
+    }
+
+    /**
+     * Set size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @param vmSize the vmSize value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withVmSize(ContainerServiceVMSizeTypes vmSize) {
+        this.vmSize = vmSize;
+        return this;
+    }
+
+    /**
+     * Get oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @return the osDiskSizeGB value
+     */
+    public Integer osDiskSizeGB() {
+        return this.osDiskSizeGB;
+    }
+
+    /**
+     * Set oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @param osDiskSizeGB the osDiskSizeGB value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withOsDiskSizeGB(Integer osDiskSizeGB) {
+        this.osDiskSizeGB = osDiskSizeGB;
+        return this;
+    }
+
+    /**
+     * Get vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @return the vnetSubnetID value
+     */
+    public String vnetSubnetID() {
+        return this.vnetSubnetID;
+    }
+
+    /**
+     * Set vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @param vnetSubnetID the vnetSubnetID value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withVnetSubnetID(String vnetSubnetID) {
+        this.vnetSubnetID = vnetSubnetID;
+        return this;
+    }
+
+    /**
+     * Get maximum number of pods that can run on a node.
+     *
+     * @return the maxPods value
+     */
+    public Integer maxPods() {
+        return this.maxPods;
+    }
+
+    /**
+     * Set maximum number of pods that can run on a node.
+     *
+     * @param maxPods the maxPods value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withMaxPods(Integer maxPods) {
+        this.maxPods = maxPods;
+        return this;
+    }
+
+    /**
+     * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @return the osType value
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @param osType the osType value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * Get maximum number of nodes for auto-scaling.
+     *
+     * @return the maxCount value
+     */
+    public Integer maxCount() {
+        return this.maxCount;
+    }
+
+    /**
+     * Set maximum number of nodes for auto-scaling.
+     *
+     * @param maxCount the maxCount value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withMaxCount(Integer maxCount) {
+        this.maxCount = maxCount;
+        return this;
+    }
+
+    /**
+     * Get minimum number of nodes for auto-scaling.
+     *
+     * @return the minCount value
+     */
+    public Integer minCount() {
+        return this.minCount;
+    }
+
+    /**
+     * Set minimum number of nodes for auto-scaling.
+     *
+     * @param minCount the minCount value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withMinCount(Integer minCount) {
+        this.minCount = minCount;
+        return this;
+    }
+
+    /**
+     * Get whether to enable auto-scaler.
+     *
+     * @return the enableAutoScaling value
+     */
+    public Boolean enableAutoScaling() {
+        return this.enableAutoScaling;
+    }
+
+    /**
+     * Set whether to enable auto-scaler.
+     *
+     * @param enableAutoScaling the enableAutoScaling value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withEnableAutoScaling(Boolean enableAutoScaling) {
+        this.enableAutoScaling = enableAutoScaling;
+        return this;
+    }
+
+    /**
+     * Get agentPoolType represents types of an agent pool. Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'.
+     *
+     * @return the type value
+     */
+    public AgentPoolType type() {
+        return this.type;
+    }
+
+    /**
+     * Set agentPoolType represents types of an agent pool. Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'.
+     *
+     * @param type the type value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withType(AgentPoolType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get version of orchestrator specified when creating the managed cluster.
+     *
+     * @return the orchestratorVersion value
+     */
+    public String orchestratorVersion() {
+        return this.orchestratorVersion;
+    }
+
+    /**
+     * Set version of orchestrator specified when creating the managed cluster.
+     *
+     * @param orchestratorVersion the orchestratorVersion value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withOrchestratorVersion(String orchestratorVersion) {
+        this.orchestratorVersion = orchestratorVersion;
+        return this;
+    }
+
+    /**
+     * Get the current deployment or provisioning state, which only appears in the response.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
+     *
+     * @return the availabilityZones value
+     */
+    public List<String> availabilityZones() {
+        return this.availabilityZones;
+    }
+
+    /**
+     * Set (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
+     *
+     * @param availabilityZones the availabilityZones value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withAvailabilityZones(List<String> availabilityZones) {
+        this.availabilityZones = availabilityZones;
+        return this;
+    }
+
+    /**
+     * Get enable public IP for nodes.
+     *
+     * @return the enableNodePublicIP value
+     */
+    public Boolean enableNodePublicIP() {
+        return this.enableNodePublicIP;
+    }
+
+    /**
+     * Set enable public IP for nodes.
+     *
+     * @param enableNodePublicIP the enableNodePublicIP value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withEnableNodePublicIP(Boolean enableNodePublicIP) {
+        this.enableNodePublicIP = enableNodePublicIP;
+        return this;
+    }
+
+    /**
+     * Get scaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Low', 'Regular'.
+     *
+     * @return the scaleSetPriority value
+     */
+    public ScaleSetPriority scaleSetPriority() {
+        return this.scaleSetPriority;
+    }
+
+    /**
+     * Set scaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Low', 'Regular'.
+     *
+     * @param scaleSetPriority the scaleSetPriority value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withScaleSetPriority(ScaleSetPriority scaleSetPriority) {
+        this.scaleSetPriority = scaleSetPriority;
+        return this;
+    }
+
+    /**
+     * Get scaleSetEvictionPolicy to be used to specify eviction policy for low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'.
+     *
+     * @return the scaleSetEvictionPolicy value
+     */
+    public ScaleSetEvictionPolicy scaleSetEvictionPolicy() {
+        return this.scaleSetEvictionPolicy;
+    }
+
+    /**
+     * Set scaleSetEvictionPolicy to be used to specify eviction policy for low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'.
+     *
+     * @param scaleSetEvictionPolicy the scaleSetEvictionPolicy value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withScaleSetEvictionPolicy(ScaleSetEvictionPolicy scaleSetEvictionPolicy) {
+        this.scaleSetEvictionPolicy = scaleSetEvictionPolicy;
+        return this;
+    }
+
+    /**
+     * Get taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule.
+     *
+     * @return the nodeTaints value
+     */
+    public List<String> nodeTaints() {
+        return this.nodeTaints;
+    }
+
+    /**
+     * Set taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule.
+     *
+     * @param nodeTaints the nodeTaints value to set
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withNodeTaints(List<String> nodeTaints) {
+        this.nodeTaints = nodeTaints;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterIdentity.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterIdentity.java
new file mode 100644
index 000000000000..f6f219a46ee3
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterIdentity.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Identity for the managed cluster.
+ */
+public class ManagedClusterIdentity {
+    /**
+     * The principal id of the system assigned identity which is used by master
+     * components.
+     */
+    @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
+    private String principalId;
+
+    /**
+     * The tenant id of the system assigned identity which is used by master
+     * components.
+     */
+    @JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
+    private String tenantId;
+
+    /**
+     * The type of identity used for the managed cluster. Type 'SystemAssigned'
+     * will use an implicitly created identity in master components and an
+     * auto-created user assigned identity in MC_ resource group in agent
+     * nodes. Type 'None' will not use MSI for the managed cluster, service
+     * principal will be used instead. Possible values include:
+     * 'SystemAssigned', 'None'.
+     */
+    @JsonProperty(value = "type")
+    private ResourceIdentityType type;
+
+    /**
+     * Get the principal id of the system assigned identity which is used by master components.
+     *
+     * @return the principalId value
+     */
+    public String principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Get the tenant id of the system assigned identity which is used by master components.
+     *
+     * @return the tenantId value
+     */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Get the type of identity used for the managed cluster. Type 'SystemAssigned' will use an implicitly created identity in master components and an auto-created user assigned identity in MC_ resource group in agent nodes. Type 'None' will not use MSI for the managed cluster, service principal will be used instead. Possible values include: 'SystemAssigned', 'None'.
+     *
+     * @return the type value
+     */
+    public ResourceIdentityType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of identity used for the managed cluster. Type 'SystemAssigned' will use an implicitly created identity in master components and an auto-created user assigned identity in MC_ resource group in agent nodes. Type 'None' will not use MSI for the managed cluster, service principal will be used instead. Possible values include: 'SystemAssigned', 'None'.
+     *
+     * @param type the type value to set
+     * @return the ManagedClusterIdentity object itself.
+     */
+    public ManagedClusterIdentity withType(ResourceIdentityType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfile.java
new file mode 100644
index 000000000000..3ab674e0d62b
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfile.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.containerservice.v2019_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The list of available upgrade versions.
+ */
+public class ManagedClusterPoolUpgradeProfile {
+    /**
+     * Kubernetes version (major, minor, patch).
+     */
+    @JsonProperty(value = "kubernetesVersion", required = true)
+    private String kubernetesVersion;
+
+    /**
+     * Pool name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * OsType to be used to specify os type. Choose from Linux and Windows.
+     * Default to Linux. Possible values include: 'Linux', 'Windows'.
+     */
+    @JsonProperty(value = "osType", required = true)
+    private OSType osType;
+
+    /**
+     * List of orchestrator types and versions available for upgrade.
+     */
+    @JsonProperty(value = "upgrades")
+    private List<ManagedClusterPoolUpgradeProfileUpgradesItem> upgrades;
+
+    /**
+     * Get kubernetes version (major, minor, patch).
+     *
+     * @return the kubernetesVersion value
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set kubernetes version (major, minor, patch).
+     *
+     * @param kubernetesVersion the kubernetesVersion value to set
+     * @return the ManagedClusterPoolUpgradeProfile object itself.
+     */
+    public ManagedClusterPoolUpgradeProfile withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get pool name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set pool name.
+     *
+     * @param name the name value to set
+     * @return the ManagedClusterPoolUpgradeProfile object itself.
+     */
+    public ManagedClusterPoolUpgradeProfile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @return the osType value
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @param osType the osType value to set
+     * @return the ManagedClusterPoolUpgradeProfile object itself.
+     */
+    public ManagedClusterPoolUpgradeProfile withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * Get list of orchestrator types and versions available for upgrade.
+     *
+     * @return the upgrades value
+     */
+    public List<ManagedClusterPoolUpgradeProfileUpgradesItem> upgrades() {
+        return this.upgrades;
+    }
+
+    /**
+     * Set list of orchestrator types and versions available for upgrade.
+     *
+     * @param upgrades the upgrades value to set
+     * @return the ManagedClusterPoolUpgradeProfile object itself.
+     */
+    public ManagedClusterPoolUpgradeProfile withUpgrades(List<ManagedClusterPoolUpgradeProfileUpgradesItem> upgrades) {
+        this.upgrades = upgrades;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfileUpgradesItem.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfileUpgradesItem.java
new file mode 100644
index 000000000000..cb59e520c577
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterPoolUpgradeProfileUpgradesItem.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The ManagedClusterPoolUpgradeProfileUpgradesItem model.
+ */
+public class ManagedClusterPoolUpgradeProfileUpgradesItem {
+    /**
+     * Kubernetes version (major, minor, patch).
+     */
+    @JsonProperty(value = "kubernetesVersion")
+    private String kubernetesVersion;
+
+    /**
+     * Whether Kubernetes version is currently in preview.
+     */
+    @JsonProperty(value = "isPreview")
+    private Boolean isPreview;
+
+    /**
+     * Get kubernetes version (major, minor, patch).
+     *
+     * @return the kubernetesVersion value
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set kubernetes version (major, minor, patch).
+     *
+     * @param kubernetesVersion the kubernetesVersion value to set
+     * @return the ManagedClusterPoolUpgradeProfileUpgradesItem object itself.
+     */
+    public ManagedClusterPoolUpgradeProfileUpgradesItem withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get whether Kubernetes version is currently in preview.
+     *
+     * @return the isPreview value
+     */
+    public Boolean isPreview() {
+        return this.isPreview;
+    }
+
+    /**
+     * Set whether Kubernetes version is currently in preview.
+     *
+     * @param isPreview the isPreview value to set
+     * @return the ManagedClusterPoolUpgradeProfileUpgradesItem object itself.
+     */
+    public ManagedClusterPoolUpgradeProfileUpgradesItem withIsPreview(Boolean isPreview) {
+        this.isPreview = isPreview;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterServicePrincipalProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterServicePrincipalProfile.java
new file mode 100644
index 000000000000..19f91f2c92f8
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterServicePrincipalProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Information about a service principal identity for the cluster to use for
+ * manipulating Azure APIs.
+ */
+public class ManagedClusterServicePrincipalProfile {
+    /**
+     * The ID for the service principal.
+     */
+    @JsonProperty(value = "clientId", required = true)
+    private String clientId;
+
+    /**
+     * The secret password associated with the service principal in plain text.
+     */
+    @JsonProperty(value = "secret")
+    private String secret;
+
+    /**
+     * Get the ID for the service principal.
+     *
+     * @return the clientId value
+     */
+    public String clientId() {
+        return this.clientId;
+    }
+
+    /**
+     * Set the ID for the service principal.
+     *
+     * @param clientId the clientId value to set
+     * @return the ManagedClusterServicePrincipalProfile object itself.
+     */
+    public ManagedClusterServicePrincipalProfile withClientId(String clientId) {
+        this.clientId = clientId;
+        return this;
+    }
+
+    /**
+     * Get the secret password associated with the service principal in plain text.
+     *
+     * @return the secret value
+     */
+    public String secret() {
+        return this.secret;
+    }
+
+    /**
+     * Set the secret password associated with the service principal in plain text.
+     *
+     * @param secret the secret value to set
+     * @return the ManagedClusterServicePrincipalProfile object itself.
+     */
+    public ManagedClusterServicePrincipalProfile withSecret(String secret) {
+        this.secret = secret;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterUpgradeProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterUpgradeProfile.java
new file mode 100644
index 000000000000..4618a6d38d5e
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterUpgradeProfile.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ManagedClusterUpgradeProfileInner;
+import java.util.List;
+
+/**
+ * Type representing ManagedClusterUpgradeProfile.
+ */
+public interface ManagedClusterUpgradeProfile extends HasInner<ManagedClusterUpgradeProfileInner>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the agentPoolProfiles value.
+     */
+    List<ManagedClusterPoolUpgradeProfile> agentPoolProfiles();
+
+    /**
+     * @return the controlPlaneProfile value.
+     */
+    ManagedClusterPoolUpgradeProfile controlPlaneProfile();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterWindowsProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterWindowsProfile.java
new file mode 100644
index 000000000000..36aec714ddd4
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusterWindowsProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Profile for Windows VMs in the container service cluster.
+ */
+public class ManagedClusterWindowsProfile {
+    /**
+     * The administrator username to use for Windows VMs.
+     */
+    @JsonProperty(value = "adminUsername", required = true)
+    private String adminUsername;
+
+    /**
+     * The administrator password to use for Windows VMs.
+     */
+    @JsonProperty(value = "adminPassword")
+    private String adminPassword;
+
+    /**
+     * Get the administrator username to use for Windows VMs.
+     *
+     * @return the adminUsername value
+     */
+    public String adminUsername() {
+        return this.adminUsername;
+    }
+
+    /**
+     * Set the administrator username to use for Windows VMs.
+     *
+     * @param adminUsername the adminUsername value to set
+     * @return the ManagedClusterWindowsProfile object itself.
+     */
+    public ManagedClusterWindowsProfile withAdminUsername(String adminUsername) {
+        this.adminUsername = adminUsername;
+        return this;
+    }
+
+    /**
+     * Get the administrator password to use for Windows VMs.
+     *
+     * @return the adminPassword value
+     */
+    public String adminPassword() {
+        return this.adminPassword;
+    }
+
+    /**
+     * Set the administrator password to use for Windows VMs.
+     *
+     * @param adminPassword the adminPassword value to set
+     * @return the ManagedClusterWindowsProfile object itself.
+     */
+    public ManagedClusterWindowsProfile withAdminPassword(String adminPassword) {
+        this.adminPassword = adminPassword;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusters.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusters.java
new file mode 100644
index 000000000000..380aee17ab3e
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ManagedClusters.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.containerservice.v2019_06_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.containerservice.v2019_06_01.implementation.ManagedClustersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ManagedClusters.
+ */
+public interface ManagedClusters extends SupportsCreating<ManagedCluster.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<ManagedCluster>, SupportsListingByResourceGroup<ManagedCluster>, SupportsListing<ManagedCluster>, HasInner<ManagedClustersInner> {
+    /**
+     * Gets cluster admin credential of a managed cluster.
+     * Gets cluster admin credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<CredentialResults> listClusterAdminCredentialsAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets cluster user credential of a managed cluster.
+     * Gets cluster user credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<CredentialResults> listClusterUserCredentialsAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable resetServicePrincipalProfileAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters);
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable resetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters);
+
+    /**
+     * Gets upgrade profile for a managed cluster.
+     * Gets the details of the upgrade profile for a managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedClusterUpgradeProfile> getUpgradeProfileAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets an access profile of a managed cluster.
+     * Gets the accessProfile for the specified role name of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param roleName The name of the role for managed cluster accessProfile resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedClusterAccessProfile> getAccessProfileAsync(String resourceGroupName, String resourceName, String roleName);
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPlugin.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPlugin.java
new file mode 100644
index 000000000000..7f0a9805dd79
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPlugin.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for NetworkPlugin.
+ */
+public final class NetworkPlugin extends ExpandableStringEnum<NetworkPlugin> {
+    /** Static value azure for NetworkPlugin. */
+    public static final NetworkPlugin AZURE = fromString("azure");
+
+    /** Static value kubenet for NetworkPlugin. */
+    public static final NetworkPlugin KUBENET = fromString("kubenet");
+
+    /**
+     * Creates or finds a NetworkPlugin from its string representation.
+     * @param name a name to look for
+     * @return the corresponding NetworkPlugin
+     */
+    @JsonCreator
+    public static NetworkPlugin fromString(String name) {
+        return fromString(name, NetworkPlugin.class);
+    }
+
+    /**
+     * @return known NetworkPlugin values
+     */
+    public static Collection<NetworkPlugin> values() {
+        return values(NetworkPlugin.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPolicy.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPolicy.java
new file mode 100644
index 000000000000..5c643c06f6e9
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkPolicy.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for NetworkPolicy.
+ */
+public final class NetworkPolicy extends ExpandableStringEnum<NetworkPolicy> {
+    /** Static value calico for NetworkPolicy. */
+    public static final NetworkPolicy CALICO = fromString("calico");
+
+    /** Static value azure for NetworkPolicy. */
+    public static final NetworkPolicy AZURE = fromString("azure");
+
+    /**
+     * Creates or finds a NetworkPolicy from its string representation.
+     * @param name a name to look for
+     * @return the corresponding NetworkPolicy
+     */
+    @JsonCreator
+    public static NetworkPolicy fromString(String name) {
+        return fromString(name, NetworkPolicy.class);
+    }
+
+    /**
+     * @return known NetworkPolicy values
+     */
+    public static Collection<NetworkPolicy> values() {
+        return values(NetworkPolicy.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkProfile.java
new file mode 100644
index 000000000000..16f59b9ac7f9
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/NetworkProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Represents the OpenShift networking configuration.
+ */
+public class NetworkProfile {
+    /**
+     * CIDR for the OpenShift Vnet.
+     */
+    @JsonProperty(value = "vnetCidr")
+    private String vnetCidr;
+
+    /**
+     * CIDR of the Vnet to peer.
+     */
+    @JsonProperty(value = "peerVnetId")
+    private String peerVnetId;
+
+    /**
+     * ID of the Vnet created for OSA cluster.
+     */
+    @JsonProperty(value = "vnetId")
+    private String vnetId;
+
+    /**
+     * Get cIDR for the OpenShift Vnet.
+     *
+     * @return the vnetCidr value
+     */
+    public String vnetCidr() {
+        return this.vnetCidr;
+    }
+
+    /**
+     * Set cIDR for the OpenShift Vnet.
+     *
+     * @param vnetCidr the vnetCidr value to set
+     * @return the NetworkProfile object itself.
+     */
+    public NetworkProfile withVnetCidr(String vnetCidr) {
+        this.vnetCidr = vnetCidr;
+        return this;
+    }
+
+    /**
+     * Get cIDR of the Vnet to peer.
+     *
+     * @return the peerVnetId value
+     */
+    public String peerVnetId() {
+        return this.peerVnetId;
+    }
+
+    /**
+     * Set cIDR of the Vnet to peer.
+     *
+     * @param peerVnetId the peerVnetId value to set
+     * @return the NetworkProfile object itself.
+     */
+    public NetworkProfile withPeerVnetId(String peerVnetId) {
+        this.peerVnetId = peerVnetId;
+        return this;
+    }
+
+    /**
+     * Get iD of the Vnet created for OSA cluster.
+     *
+     * @return the vnetId value
+     */
+    public String vnetId() {
+        return this.vnetId;
+    }
+
+    /**
+     * Set iD of the Vnet created for OSA cluster.
+     *
+     * @param vnetId the vnetId value to set
+     * @return the NetworkProfile object itself.
+     */
+    public NetworkProfile withVnetId(String vnetId) {
+        this.vnetId = vnetId;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OSType.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OSType.java
new file mode 100644
index 000000000000..f6505aab7bdf
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OSType.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OSType.
+ */
+public final class OSType extends ExpandableStringEnum<OSType> {
+    /** Static value Linux for OSType. */
+    public static final OSType LINUX = fromString("Linux");
+
+    /** Static value Windows for OSType. */
+    public static final OSType WINDOWS = fromString("Windows");
+
+    /**
+     * Creates or finds a OSType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OSType
+     */
+    @JsonCreator
+    public static OSType fromString(String name) {
+        return fromString(name, OSType.class);
+    }
+
+    /**
+     * @return known OSType values
+     */
+    public static Collection<OSType> values() {
+        return values(OSType.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftAgentPoolProfileRole.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftAgentPoolProfileRole.java
new file mode 100644
index 000000000000..3d037fb4a5d8
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftAgentPoolProfileRole.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OpenShiftAgentPoolProfileRole.
+ */
+public final class OpenShiftAgentPoolProfileRole extends ExpandableStringEnum<OpenShiftAgentPoolProfileRole> {
+    /** Static value compute for OpenShiftAgentPoolProfileRole. */
+    public static final OpenShiftAgentPoolProfileRole COMPUTE = fromString("compute");
+
+    /** Static value infra for OpenShiftAgentPoolProfileRole. */
+    public static final OpenShiftAgentPoolProfileRole INFRA = fromString("infra");
+
+    /**
+     * Creates or finds a OpenShiftAgentPoolProfileRole from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OpenShiftAgentPoolProfileRole
+     */
+    @JsonCreator
+    public static OpenShiftAgentPoolProfileRole fromString(String name) {
+        return fromString(name, OpenShiftAgentPoolProfileRole.class);
+    }
+
+    /**
+     * @return known OpenShiftAgentPoolProfileRole values
+     */
+    public static Collection<OpenShiftAgentPoolProfileRole> values() {
+        return values(OpenShiftAgentPoolProfileRole.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftContainerServiceVMSize.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftContainerServiceVMSize.java
new file mode 100644
index 000000000000..54a88b95bce8
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftContainerServiceVMSize.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for OpenShiftContainerServiceVMSize.
+ */
+public final class OpenShiftContainerServiceVMSize extends ExpandableStringEnum<OpenShiftContainerServiceVMSize> {
+    /** Static value Standard_D2s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_D2S_V3 = fromString("Standard_D2s_v3");
+
+    /** Static value Standard_D4s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_D4S_V3 = fromString("Standard_D4s_v3");
+
+    /** Static value Standard_D8s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_D8S_V3 = fromString("Standard_D8s_v3");
+
+    /** Static value Standard_D16s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_D16S_V3 = fromString("Standard_D16s_v3");
+
+    /** Static value Standard_D32s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_D32S_V3 = fromString("Standard_D32s_v3");
+
+    /** Static value Standard_D64s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_D64S_V3 = fromString("Standard_D64s_v3");
+
+    /** Static value Standard_DS4_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_DS4_V2 = fromString("Standard_DS4_v2");
+
+    /** Static value Standard_DS5_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_DS5_V2 = fromString("Standard_DS5_v2");
+
+    /** Static value Standard_F8s_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_F8S_V2 = fromString("Standard_F8s_v2");
+
+    /** Static value Standard_F16s_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_F16S_V2 = fromString("Standard_F16s_v2");
+
+    /** Static value Standard_F32s_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_F32S_V2 = fromString("Standard_F32s_v2");
+
+    /** Static value Standard_F64s_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_F64S_V2 = fromString("Standard_F64s_v2");
+
+    /** Static value Standard_F72s_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_F72S_V2 = fromString("Standard_F72s_v2");
+
+    /** Static value Standard_F8s for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_F8S = fromString("Standard_F8s");
+
+    /** Static value Standard_F16s for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_F16S = fromString("Standard_F16s");
+
+    /** Static value Standard_E4s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_E4S_V3 = fromString("Standard_E4s_v3");
+
+    /** Static value Standard_E8s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_E8S_V3 = fromString("Standard_E8s_v3");
+
+    /** Static value Standard_E16s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_E16S_V3 = fromString("Standard_E16s_v3");
+
+    /** Static value Standard_E20s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_E20S_V3 = fromString("Standard_E20s_v3");
+
+    /** Static value Standard_E32s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_E32S_V3 = fromString("Standard_E32s_v3");
+
+    /** Static value Standard_E64s_v3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_E64S_V3 = fromString("Standard_E64s_v3");
+
+    /** Static value Standard_GS2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_GS2 = fromString("Standard_GS2");
+
+    /** Static value Standard_GS3 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_GS3 = fromString("Standard_GS3");
+
+    /** Static value Standard_GS4 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_GS4 = fromString("Standard_GS4");
+
+    /** Static value Standard_GS5 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_GS5 = fromString("Standard_GS5");
+
+    /** Static value Standard_DS12_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_DS12_V2 = fromString("Standard_DS12_v2");
+
+    /** Static value Standard_DS13_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_DS13_V2 = fromString("Standard_DS13_v2");
+
+    /** Static value Standard_DS14_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_DS14_V2 = fromString("Standard_DS14_v2");
+
+    /** Static value Standard_DS15_v2 for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_DS15_V2 = fromString("Standard_DS15_v2");
+
+    /** Static value Standard_L4s for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_L4S = fromString("Standard_L4s");
+
+    /** Static value Standard_L8s for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_L8S = fromString("Standard_L8s");
+
+    /** Static value Standard_L16s for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_L16S = fromString("Standard_L16s");
+
+    /** Static value Standard_L32s for OpenShiftContainerServiceVMSize. */
+    public static final OpenShiftContainerServiceVMSize STANDARD_L32S = fromString("Standard_L32s");
+
+    /**
+     * Creates or finds a OpenShiftContainerServiceVMSize from its string representation.
+     * @param name a name to look for
+     * @return the corresponding OpenShiftContainerServiceVMSize
+     */
+    @JsonCreator
+    public static OpenShiftContainerServiceVMSize fromString(String name) {
+        return fromString(name, OpenShiftContainerServiceVMSize.class);
+    }
+
+    /**
+     * @return known OpenShiftContainerServiceVMSize values
+     */
+    public static Collection<OpenShiftContainerServiceVMSize> values() {
+        return values(OpenShiftContainerServiceVMSize.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedCluster.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedCluster.java
new file mode 100644
index 000000000000..97f12843c709
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedCluster.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.containerservice.v2019_06_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.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.OpenShiftManagedClusterInner;
+
+/**
+ * Type representing OpenShiftManagedCluster.
+ */
+public interface OpenShiftManagedCluster extends HasInner<OpenShiftManagedClusterInner>, Resource, GroupableResourceCore<ContainerServiceManager, OpenShiftManagedClusterInner>, HasResourceGroup, Refreshable<OpenShiftManagedCluster>, Updatable<OpenShiftManagedCluster.Update>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the agentPoolProfiles value.
+     */
+    List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles();
+
+    /**
+     * @return the authProfile value.
+     */
+    OpenShiftManagedClusterAuthProfile authProfile();
+
+    /**
+     * @return the clusterVersion value.
+     */
+    String clusterVersion();
+
+    /**
+     * @return the fqdn value.
+     */
+    String fqdn();
+
+    /**
+     * @return the masterPoolProfile value.
+     */
+    OpenShiftManagedClusterMasterPoolProfile masterPoolProfile();
+
+    /**
+     * @return the networkProfile value.
+     */
+    NetworkProfile networkProfile();
+
+    /**
+     * @return the openShiftVersion value.
+     */
+    String openShiftVersion();
+
+    /**
+     * @return the plan value.
+     */
+    PurchasePlan plan();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the publicHostname value.
+     */
+    String publicHostname();
+
+    /**
+     * @return the routerProfiles value.
+     */
+    List<OpenShiftRouterProfile> routerProfiles();
+
+    /**
+     * The entirety of the OpenShiftManagedCluster definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithOpenShiftVersion, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of OpenShiftManagedCluster definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a OpenShiftManagedCluster definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the OpenShiftManagedCluster definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithOpenShiftVersion> {
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster definition allowing to specify OpenShiftVersion.
+         */
+        interface WithOpenShiftVersion {
+           /**
+            * Specifies openShiftVersion.
+            * @param openShiftVersion Version of OpenShift specified when creating the cluster
+            * @return the next definition stage
+*/
+            WithCreate withOpenShiftVersion(String openShiftVersion);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster definition allowing to specify AgentPoolProfiles.
+         */
+        interface WithAgentPoolProfiles {
+            /**
+             * Specifies agentPoolProfiles.
+             * @param agentPoolProfiles Configuration of OpenShift cluster VMs
+             * @return the next definition stage
+             */
+            WithCreate withAgentPoolProfiles(List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster definition allowing to specify AuthProfile.
+         */
+        interface WithAuthProfile {
+            /**
+             * Specifies authProfile.
+             * @param authProfile Configures OpenShift authentication
+             * @return the next definition stage
+             */
+            WithCreate withAuthProfile(OpenShiftManagedClusterAuthProfile authProfile);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster definition allowing to specify MasterPoolProfile.
+         */
+        interface WithMasterPoolProfile {
+            /**
+             * Specifies masterPoolProfile.
+             * @param masterPoolProfile Configuration for OpenShift master VMs
+             * @return the next definition stage
+             */
+            WithCreate withMasterPoolProfile(OpenShiftManagedClusterMasterPoolProfile masterPoolProfile);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster definition allowing to specify NetworkProfile.
+         */
+        interface WithNetworkProfile {
+            /**
+             * Specifies networkProfile.
+             * @param networkProfile Configuration for OpenShift networking
+             * @return the next definition stage
+             */
+            WithCreate withNetworkProfile(NetworkProfile networkProfile);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster definition allowing to specify Plan.
+         */
+        interface WithPlan {
+            /**
+             * Specifies plan.
+             * @param plan Define the resource plan as required by ARM for billing purposes
+             * @return the next definition stage
+             */
+            WithCreate withPlan(PurchasePlan plan);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster definition allowing to specify RouterProfiles.
+         */
+        interface WithRouterProfiles {
+            /**
+             * Specifies routerProfiles.
+             * @param routerProfiles Configuration for OpenShift router(s)
+             * @return the next definition stage
+             */
+            WithCreate withRouterProfiles(List<OpenShiftRouterProfile> routerProfiles);
+        }
+
+        /**
+         * 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<OpenShiftManagedCluster>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAgentPoolProfiles, DefinitionStages.WithAuthProfile, DefinitionStages.WithMasterPoolProfile, DefinitionStages.WithNetworkProfile, DefinitionStages.WithPlan, DefinitionStages.WithRouterProfiles {
+        }
+    }
+    /**
+     * The template for a OpenShiftManagedCluster update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<OpenShiftManagedCluster>, Resource.UpdateWithTags<Update>, UpdateStages.WithAgentPoolProfiles, UpdateStages.WithAuthProfile, UpdateStages.WithMasterPoolProfile, UpdateStages.WithNetworkProfile, UpdateStages.WithPlan, UpdateStages.WithRouterProfiles {
+    }
+
+    /**
+     * Grouping of OpenShiftManagedCluster update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the openshiftmanagedcluster update allowing to specify AgentPoolProfiles.
+         */
+        interface WithAgentPoolProfiles {
+            /**
+             * Specifies agentPoolProfiles.
+             * @param agentPoolProfiles Configuration of OpenShift cluster VMs
+             * @return the next update stage
+             */
+            Update withAgentPoolProfiles(List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster update allowing to specify AuthProfile.
+         */
+        interface WithAuthProfile {
+            /**
+             * Specifies authProfile.
+             * @param authProfile Configures OpenShift authentication
+             * @return the next update stage
+             */
+            Update withAuthProfile(OpenShiftManagedClusterAuthProfile authProfile);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster update allowing to specify MasterPoolProfile.
+         */
+        interface WithMasterPoolProfile {
+            /**
+             * Specifies masterPoolProfile.
+             * @param masterPoolProfile Configuration for OpenShift master VMs
+             * @return the next update stage
+             */
+            Update withMasterPoolProfile(OpenShiftManagedClusterMasterPoolProfile masterPoolProfile);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster update allowing to specify NetworkProfile.
+         */
+        interface WithNetworkProfile {
+            /**
+             * Specifies networkProfile.
+             * @param networkProfile Configuration for OpenShift networking
+             * @return the next update stage
+             */
+            Update withNetworkProfile(NetworkProfile networkProfile);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster update allowing to specify Plan.
+         */
+        interface WithPlan {
+            /**
+             * Specifies plan.
+             * @param plan Define the resource plan as required by ARM for billing purposes
+             * @return the next update stage
+             */
+            Update withPlan(PurchasePlan plan);
+        }
+
+        /**
+         * The stage of the openshiftmanagedcluster update allowing to specify RouterProfiles.
+         */
+        interface WithRouterProfiles {
+            /**
+             * Specifies routerProfiles.
+             * @param routerProfiles Configuration for OpenShift router(s)
+             * @return the next update stage
+             */
+            Update withRouterProfiles(List<OpenShiftRouterProfile> routerProfiles);
+        }
+
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java
new file mode 100644
index 000000000000..c18b5d4d7615
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Defines the Identity provider for MS AAD.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind", defaultImpl = OpenShiftManagedClusterAADIdentityProvider.class)
+@JsonTypeName("AADIdentityProvider")
+public class OpenShiftManagedClusterAADIdentityProvider extends OpenShiftManagedClusterBaseIdentityProvider {
+    /**
+     * The clientId password associated with the provider.
+     */
+    @JsonProperty(value = "clientId")
+    private String clientId;
+
+    /**
+     * The secret password associated with the provider.
+     */
+    @JsonProperty(value = "secret")
+    private String secret;
+
+    /**
+     * The tenantId associated with the provider.
+     */
+    @JsonProperty(value = "tenantId")
+    private String tenantId;
+
+    /**
+     * The groupId to be granted cluster admin role.
+     */
+    @JsonProperty(value = "customerAdminGroupId")
+    private String customerAdminGroupId;
+
+    /**
+     * Get the clientId password associated with the provider.
+     *
+     * @return the clientId value
+     */
+    public String clientId() {
+        return this.clientId;
+    }
+
+    /**
+     * Set the clientId password associated with the provider.
+     *
+     * @param clientId the clientId value to set
+     * @return the OpenShiftManagedClusterAADIdentityProvider object itself.
+     */
+    public OpenShiftManagedClusterAADIdentityProvider withClientId(String clientId) {
+        this.clientId = clientId;
+        return this;
+    }
+
+    /**
+     * Get the secret password associated with the provider.
+     *
+     * @return the secret value
+     */
+    public String secret() {
+        return this.secret;
+    }
+
+    /**
+     * Set the secret password associated with the provider.
+     *
+     * @param secret the secret value to set
+     * @return the OpenShiftManagedClusterAADIdentityProvider object itself.
+     */
+    public OpenShiftManagedClusterAADIdentityProvider withSecret(String secret) {
+        this.secret = secret;
+        return this;
+    }
+
+    /**
+     * Get the tenantId associated with the provider.
+     *
+     * @return the tenantId value
+     */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Set the tenantId associated with the provider.
+     *
+     * @param tenantId the tenantId value to set
+     * @return the OpenShiftManagedClusterAADIdentityProvider object itself.
+     */
+    public OpenShiftManagedClusterAADIdentityProvider withTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+    /**
+     * Get the groupId to be granted cluster admin role.
+     *
+     * @return the customerAdminGroupId value
+     */
+    public String customerAdminGroupId() {
+        return this.customerAdminGroupId;
+    }
+
+    /**
+     * Set the groupId to be granted cluster admin role.
+     *
+     * @param customerAdminGroupId the customerAdminGroupId value to set
+     * @return the OpenShiftManagedClusterAADIdentityProvider object itself.
+     */
+    public OpenShiftManagedClusterAADIdentityProvider withCustomerAdminGroupId(String customerAdminGroupId) {
+        this.customerAdminGroupId = customerAdminGroupId;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAgentPoolProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAgentPoolProfile.java
new file mode 100644
index 000000000000..be419af2edeb
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAgentPoolProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines the configuration of the OpenShift cluster VMs.
+ */
+public class OpenShiftManagedClusterAgentPoolProfile {
+    /**
+     * Unique name of the pool profile in the context of the subscription and
+     * resource group.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Number of agents (VMs) to host docker containers.
+     */
+    @JsonProperty(value = "count", required = true)
+    private int count;
+
+    /**
+     * Size of agent VMs. Possible values include: 'Standard_D2s_v3',
+     * 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3',
+     * 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2',
+     * 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2',
+     * 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2',
+     * 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3',
+     * 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3',
+     * 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4',
+     * 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     * 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s',
+     * 'Standard_L16s', 'Standard_L32s'.
+     */
+    @JsonProperty(value = "vmSize", required = true)
+    private OpenShiftContainerServiceVMSize vmSize;
+
+    /**
+     * Subnet CIDR for the peering.
+     */
+    @JsonProperty(value = "subnetCidr")
+    private String subnetCidr;
+
+    /**
+     * OsType to be used to specify os type. Choose from Linux and Windows.
+     * Default to Linux. Possible values include: 'Linux', 'Windows'.
+     */
+    @JsonProperty(value = "osType")
+    private OSType osType;
+
+    /**
+     * Define the role of the AgentPoolProfile. Possible values include:
+     * 'compute', 'infra'.
+     */
+    @JsonProperty(value = "role")
+    private OpenShiftAgentPoolProfileRole role;
+
+    /**
+     * Get unique name of the pool profile in the context of the subscription and resource group.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set unique name of the pool profile in the context of the subscription and resource group.
+     *
+     * @param name the name value to set
+     * @return the OpenShiftManagedClusterAgentPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterAgentPoolProfile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get number of agents (VMs) to host docker containers.
+     *
+     * @return the count value
+     */
+    public int count() {
+        return this.count;
+    }
+
+    /**
+     * Set number of agents (VMs) to host docker containers.
+     *
+     * @param count the count value to set
+     * @return the OpenShiftManagedClusterAgentPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterAgentPoolProfile withCount(int count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get size of agent VMs. Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'.
+     *
+     * @return the vmSize value
+     */
+    public OpenShiftContainerServiceVMSize vmSize() {
+        return this.vmSize;
+    }
+
+    /**
+     * Set size of agent VMs. Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'.
+     *
+     * @param vmSize the vmSize value to set
+     * @return the OpenShiftManagedClusterAgentPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterAgentPoolProfile withVmSize(OpenShiftContainerServiceVMSize vmSize) {
+        this.vmSize = vmSize;
+        return this;
+    }
+
+    /**
+     * Get subnet CIDR for the peering.
+     *
+     * @return the subnetCidr value
+     */
+    public String subnetCidr() {
+        return this.subnetCidr;
+    }
+
+    /**
+     * Set subnet CIDR for the peering.
+     *
+     * @param subnetCidr the subnetCidr value to set
+     * @return the OpenShiftManagedClusterAgentPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterAgentPoolProfile withSubnetCidr(String subnetCidr) {
+        this.subnetCidr = subnetCidr;
+        return this;
+    }
+
+    /**
+     * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @return the osType value
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @param osType the osType value to set
+     * @return the OpenShiftManagedClusterAgentPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterAgentPoolProfile withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * Get define the role of the AgentPoolProfile. Possible values include: 'compute', 'infra'.
+     *
+     * @return the role value
+     */
+    public OpenShiftAgentPoolProfileRole role() {
+        return this.role;
+    }
+
+    /**
+     * Set define the role of the AgentPoolProfile. Possible values include: 'compute', 'infra'.
+     *
+     * @param role the role value to set
+     * @return the OpenShiftManagedClusterAgentPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterAgentPoolProfile withRole(OpenShiftAgentPoolProfileRole role) {
+        this.role = role;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAuthProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAuthProfile.java
new file mode 100644
index 000000000000..2d7c59ae2eb3
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAuthProfile.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.containerservice.v2019_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines all possible authentication profiles for the OpenShift cluster.
+ */
+public class OpenShiftManagedClusterAuthProfile {
+    /**
+     * Type of authentication profile to use.
+     */
+    @JsonProperty(value = "identityProviders")
+    private List<OpenShiftManagedClusterIdentityProvider> identityProviders;
+
+    /**
+     * Get type of authentication profile to use.
+     *
+     * @return the identityProviders value
+     */
+    public List<OpenShiftManagedClusterIdentityProvider> identityProviders() {
+        return this.identityProviders;
+    }
+
+    /**
+     * Set type of authentication profile to use.
+     *
+     * @param identityProviders the identityProviders value to set
+     * @return the OpenShiftManagedClusterAuthProfile object itself.
+     */
+    public OpenShiftManagedClusterAuthProfile withIdentityProviders(List<OpenShiftManagedClusterIdentityProvider> identityProviders) {
+        this.identityProviders = identityProviders;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java
new file mode 100644
index 000000000000..2c6e011105ef
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * Structure for any Identity provider.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind", defaultImpl = OpenShiftManagedClusterBaseIdentityProvider.class)
+@JsonTypeName("OpenShiftManagedClusterBaseIdentityProvider")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "AADIdentityProvider", value = OpenShiftManagedClusterAADIdentityProvider.class)
+})
+public class OpenShiftManagedClusterBaseIdentityProvider {
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterIdentityProvider.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterIdentityProvider.java
new file mode 100644
index 000000000000..005280e188ef
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterIdentityProvider.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines the configuration of the identity providers to be used in the
+ * OpenShift cluster.
+ */
+public class OpenShiftManagedClusterIdentityProvider {
+    /**
+     * Name of the provider.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Configuration of the provider.
+     */
+    @JsonProperty(value = "provider")
+    private OpenShiftManagedClusterBaseIdentityProvider provider;
+
+    /**
+     * Get name of the provider.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the provider.
+     *
+     * @param name the name value to set
+     * @return the OpenShiftManagedClusterIdentityProvider object itself.
+     */
+    public OpenShiftManagedClusterIdentityProvider withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get configuration of the provider.
+     *
+     * @return the provider value
+     */
+    public OpenShiftManagedClusterBaseIdentityProvider provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set configuration of the provider.
+     *
+     * @param provider the provider value to set
+     * @return the OpenShiftManagedClusterIdentityProvider object itself.
+     */
+    public OpenShiftManagedClusterIdentityProvider withProvider(OpenShiftManagedClusterBaseIdentityProvider provider) {
+        this.provider = provider;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterMasterPoolProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterMasterPoolProfile.java
new file mode 100644
index 000000000000..a8475bc8dc0c
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterMasterPoolProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift
+ * master VMs.
+ */
+public class OpenShiftManagedClusterMasterPoolProfile {
+    /**
+     * Unique name of the master pool profile in the context of the
+     * subscription and resource group.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Number of masters (VMs) to host docker containers. The default value is
+     * 3.
+     */
+    @JsonProperty(value = "count", required = true)
+    private int count;
+
+    /**
+     * Size of agent VMs. Possible values include: 'Standard_D2s_v3',
+     * 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3',
+     * 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2',
+     * 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2',
+     * 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2',
+     * 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3',
+     * 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3',
+     * 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4',
+     * 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     * 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s',
+     * 'Standard_L16s', 'Standard_L32s'.
+     */
+    @JsonProperty(value = "vmSize", required = true)
+    private OpenShiftContainerServiceVMSize vmSize;
+
+    /**
+     * Subnet CIDR for the peering.
+     */
+    @JsonProperty(value = "subnetCidr")
+    private String subnetCidr;
+
+    /**
+     * OsType to be used to specify os type. Choose from Linux and Windows.
+     * Default to Linux. Possible values include: 'Linux', 'Windows'.
+     */
+    @JsonProperty(value = "osType")
+    private OSType osType;
+
+    /**
+     * Get unique name of the master pool profile in the context of the subscription and resource group.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set unique name of the master pool profile in the context of the subscription and resource group.
+     *
+     * @param name the name value to set
+     * @return the OpenShiftManagedClusterMasterPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterMasterPoolProfile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get number of masters (VMs) to host docker containers. The default value is 3.
+     *
+     * @return the count value
+     */
+    public int count() {
+        return this.count;
+    }
+
+    /**
+     * Set number of masters (VMs) to host docker containers. The default value is 3.
+     *
+     * @param count the count value to set
+     * @return the OpenShiftManagedClusterMasterPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterMasterPoolProfile withCount(int count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get size of agent VMs. Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'.
+     *
+     * @return the vmSize value
+     */
+    public OpenShiftContainerServiceVMSize vmSize() {
+        return this.vmSize;
+    }
+
+    /**
+     * Set size of agent VMs. Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'.
+     *
+     * @param vmSize the vmSize value to set
+     * @return the OpenShiftManagedClusterMasterPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterMasterPoolProfile withVmSize(OpenShiftContainerServiceVMSize vmSize) {
+        this.vmSize = vmSize;
+        return this;
+    }
+
+    /**
+     * Get subnet CIDR for the peering.
+     *
+     * @return the subnetCidr value
+     */
+    public String subnetCidr() {
+        return this.subnetCidr;
+    }
+
+    /**
+     * Set subnet CIDR for the peering.
+     *
+     * @param subnetCidr the subnetCidr value to set
+     * @return the OpenShiftManagedClusterMasterPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterMasterPoolProfile withSubnetCidr(String subnetCidr) {
+        this.subnetCidr = subnetCidr;
+        return this;
+    }
+
+    /**
+     * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @return the osType value
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @param osType the osType value to set
+     * @return the OpenShiftManagedClusterMasterPoolProfile object itself.
+     */
+    public OpenShiftManagedClusterMasterPoolProfile withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusters.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusters.java
new file mode 100644
index 000000000000..0a8a7c092cad
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusters.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.containerservice.v2019_06_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.containerservice.v2019_06_01.implementation.OpenShiftManagedClustersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing OpenShiftManagedClusters.
+ */
+public interface OpenShiftManagedClusters extends SupportsCreating<OpenShiftManagedCluster.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<OpenShiftManagedCluster>, SupportsListingByResourceGroup<OpenShiftManagedCluster>, SupportsListing<OpenShiftManagedCluster>, HasInner<OpenShiftManagedClustersInner> {
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftRouterProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftRouterProfile.java
new file mode 100644
index 000000000000..13c109225374
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftRouterProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Represents an OpenShift router.
+ */
+public class OpenShiftRouterProfile {
+    /**
+     * Name of the router profile.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * DNS subdomain for OpenShift router.
+     */
+    @JsonProperty(value = "publicSubdomain", access = JsonProperty.Access.WRITE_ONLY)
+    private String publicSubdomain;
+
+    /**
+     * Auto-allocated FQDN for the OpenShift router.
+     */
+    @JsonProperty(value = "fqdn", access = JsonProperty.Access.WRITE_ONLY)
+    private String fqdn;
+
+    /**
+     * Get name of the router profile.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the router profile.
+     *
+     * @param name the name value to set
+     * @return the OpenShiftRouterProfile object itself.
+     */
+    public OpenShiftRouterProfile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get dNS subdomain for OpenShift router.
+     *
+     * @return the publicSubdomain value
+     */
+    public String publicSubdomain() {
+        return this.publicSubdomain;
+    }
+
+    /**
+     * Get auto-allocated FQDN for the OpenShift router.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OperationValue.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OperationValue.java
new file mode 100644
index 000000000000..30e65cd42458
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OperationValue.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.OperationValueInner;
+
+/**
+ * Type representing OperationValue.
+ */
+public interface OperationValue extends HasInner<OperationValueInner>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the description value.
+     */
+    String description();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the operation value.
+     */
+    String operation();
+
+    /**
+     * @return the origin value.
+     */
+    String origin();
+
+    /**
+     * @return the provider value.
+     */
+    String provider();
+
+    /**
+     * @return the resource value.
+     */
+    String resource();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/Operations.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/Operations.java
new file mode 100644
index 000000000000..c3b2563d4e20
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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.containerservice.v2019_06_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.OperationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Operations.
+ */
+public interface Operations extends HasInner<OperationsInner> {
+    /**
+     * Gets a list of compute operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<OperationValue> listAsync();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorProfile.java
new file mode 100644
index 000000000000..fff570140bc2
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorProfile.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains information about orchestrator.
+ */
+public class OrchestratorProfile {
+    /**
+     * Orchestrator type.
+     */
+    @JsonProperty(value = "orchestratorType")
+    private String orchestratorType;
+
+    /**
+     * Orchestrator version (major, minor, patch).
+     */
+    @JsonProperty(value = "orchestratorVersion", required = true)
+    private String orchestratorVersion;
+
+    /**
+     * Whether Kubernetes version is currently in preview.
+     */
+    @JsonProperty(value = "isPreview")
+    private Boolean isPreview;
+
+    /**
+     * Get orchestrator type.
+     *
+     * @return the orchestratorType value
+     */
+    public String orchestratorType() {
+        return this.orchestratorType;
+    }
+
+    /**
+     * Set orchestrator type.
+     *
+     * @param orchestratorType the orchestratorType value to set
+     * @return the OrchestratorProfile object itself.
+     */
+    public OrchestratorProfile withOrchestratorType(String orchestratorType) {
+        this.orchestratorType = orchestratorType;
+        return this;
+    }
+
+    /**
+     * Get orchestrator version (major, minor, patch).
+     *
+     * @return the orchestratorVersion value
+     */
+    public String orchestratorVersion() {
+        return this.orchestratorVersion;
+    }
+
+    /**
+     * Set orchestrator version (major, minor, patch).
+     *
+     * @param orchestratorVersion the orchestratorVersion value to set
+     * @return the OrchestratorProfile object itself.
+     */
+    public OrchestratorProfile withOrchestratorVersion(String orchestratorVersion) {
+        this.orchestratorVersion = orchestratorVersion;
+        return this;
+    }
+
+    /**
+     * Get whether Kubernetes version is currently in preview.
+     *
+     * @return the isPreview value
+     */
+    public Boolean isPreview() {
+        return this.isPreview;
+    }
+
+    /**
+     * Set whether Kubernetes version is currently in preview.
+     *
+     * @param isPreview the isPreview value to set
+     * @return the OrchestratorProfile object itself.
+     */
+    public OrchestratorProfile withIsPreview(Boolean isPreview) {
+        this.isPreview = isPreview;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfile.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfile.java
new file mode 100644
index 000000000000..8c30cd86c5a4
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfile.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.containerservice.v2019_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The profile of an orchestrator and its available versions.
+ */
+public class OrchestratorVersionProfile {
+    /**
+     * Orchestrator type.
+     */
+    @JsonProperty(value = "orchestratorType", required = true)
+    private String orchestratorType;
+
+    /**
+     * Orchestrator version (major, minor, patch).
+     */
+    @JsonProperty(value = "orchestratorVersion", required = true)
+    private String orchestratorVersion;
+
+    /**
+     * Installed by default if version is not specified.
+     */
+    @JsonProperty(value = "default")
+    private Boolean defaultProperty;
+
+    /**
+     * Whether Kubernetes version is currently in preview.
+     */
+    @JsonProperty(value = "isPreview")
+    private Boolean isPreview;
+
+    /**
+     * The list of available upgrade versions.
+     */
+    @JsonProperty(value = "upgrades")
+    private List<OrchestratorProfile> upgrades;
+
+    /**
+     * Get orchestrator type.
+     *
+     * @return the orchestratorType value
+     */
+    public String orchestratorType() {
+        return this.orchestratorType;
+    }
+
+    /**
+     * Set orchestrator type.
+     *
+     * @param orchestratorType the orchestratorType value to set
+     * @return the OrchestratorVersionProfile object itself.
+     */
+    public OrchestratorVersionProfile withOrchestratorType(String orchestratorType) {
+        this.orchestratorType = orchestratorType;
+        return this;
+    }
+
+    /**
+     * Get orchestrator version (major, minor, patch).
+     *
+     * @return the orchestratorVersion value
+     */
+    public String orchestratorVersion() {
+        return this.orchestratorVersion;
+    }
+
+    /**
+     * Set orchestrator version (major, minor, patch).
+     *
+     * @param orchestratorVersion the orchestratorVersion value to set
+     * @return the OrchestratorVersionProfile object itself.
+     */
+    public OrchestratorVersionProfile withOrchestratorVersion(String orchestratorVersion) {
+        this.orchestratorVersion = orchestratorVersion;
+        return this;
+    }
+
+    /**
+     * Get installed by default if version is not specified.
+     *
+     * @return the defaultProperty value
+     */
+    public Boolean defaultProperty() {
+        return this.defaultProperty;
+    }
+
+    /**
+     * Set installed by default if version is not specified.
+     *
+     * @param defaultProperty the defaultProperty value to set
+     * @return the OrchestratorVersionProfile object itself.
+     */
+    public OrchestratorVersionProfile withDefaultProperty(Boolean defaultProperty) {
+        this.defaultProperty = defaultProperty;
+        return this;
+    }
+
+    /**
+     * Get whether Kubernetes version is currently in preview.
+     *
+     * @return the isPreview value
+     */
+    public Boolean isPreview() {
+        return this.isPreview;
+    }
+
+    /**
+     * Set whether Kubernetes version is currently in preview.
+     *
+     * @param isPreview the isPreview value to set
+     * @return the OrchestratorVersionProfile object itself.
+     */
+    public OrchestratorVersionProfile withIsPreview(Boolean isPreview) {
+        this.isPreview = isPreview;
+        return this;
+    }
+
+    /**
+     * Get the list of available upgrade versions.
+     *
+     * @return the upgrades value
+     */
+    public List<OrchestratorProfile> upgrades() {
+        return this.upgrades;
+    }
+
+    /**
+     * Set the list of available upgrade versions.
+     *
+     * @param upgrades the upgrades value to set
+     * @return the OrchestratorVersionProfile object itself.
+     */
+    public OrchestratorVersionProfile withUpgrades(List<OrchestratorProfile> upgrades) {
+        this.upgrades = upgrades;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfileListResult.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfileListResult.java
new file mode 100644
index 000000000000..b53ba3e1ddae
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OrchestratorVersionProfileListResult.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.containerservice.v2019_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.ContainerServiceManager;
+import com.microsoft.azure.management.containerservice.v2019_06_01.implementation.OrchestratorVersionProfileListResultInner;
+import java.util.List;
+
+/**
+ * Type representing OrchestratorVersionProfileListResult.
+ */
+public interface OrchestratorVersionProfileListResult extends HasInner<OrchestratorVersionProfileListResultInner>, HasManager<ContainerServiceManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the orchestrators value.
+     */
+    List<OrchestratorVersionProfile> orchestrators();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/PurchasePlan.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/PurchasePlan.java
new file mode 100644
index 000000000000..16d071671e35
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/PurchasePlan.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.containerservice.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Used for establishing the purchase context of any 3rd Party artifact through
+ * MarketPlace.
+ */
+public class PurchasePlan {
+    /**
+     * The plan ID.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Specifies the product of the image from the marketplace. This is the
+     * same value as Offer under the imageReference element.
+     */
+    @JsonProperty(value = "product")
+    private String product;
+
+    /**
+     * The promotion code.
+     */
+    @JsonProperty(value = "promotionCode")
+    private String promotionCode;
+
+    /**
+     * The plan ID.
+     */
+    @JsonProperty(value = "publisher")
+    private String publisher;
+
+    /**
+     * Get the plan ID.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the plan ID.
+     *
+     * @param name the name value to set
+     * @return the PurchasePlan object itself.
+     */
+    public PurchasePlan withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
+     *
+     * @return the product value
+     */
+    public String product() {
+        return this.product;
+    }
+
+    /**
+     * Set specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
+     *
+     * @param product the product value to set
+     * @return the PurchasePlan object itself.
+     */
+    public PurchasePlan withProduct(String product) {
+        this.product = product;
+        return this;
+    }
+
+    /**
+     * Get the promotion code.
+     *
+     * @return the promotionCode value
+     */
+    public String promotionCode() {
+        return this.promotionCode;
+    }
+
+    /**
+     * Set the promotion code.
+     *
+     * @param promotionCode the promotionCode value to set
+     * @return the PurchasePlan object itself.
+     */
+    public PurchasePlan withPromotionCode(String promotionCode) {
+        this.promotionCode = promotionCode;
+        return this;
+    }
+
+    /**
+     * Get the plan ID.
+     *
+     * @return the publisher value
+     */
+    public String publisher() {
+        return this.publisher;
+    }
+
+    /**
+     * Set the plan ID.
+     *
+     * @param publisher the publisher value to set
+     * @return the PurchasePlan object itself.
+     */
+    public PurchasePlan withPublisher(String publisher) {
+        this.publisher = publisher;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ResourceIdentityType.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ResourceIdentityType.java
new file mode 100644
index 000000000000..73e6d7cac429
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ResourceIdentityType.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.containerservice.v2019_06_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 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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetEvictionPolicy.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetEvictionPolicy.java
new file mode 100644
index 000000000000..4f75dcec4c32
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetEvictionPolicy.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ScaleSetEvictionPolicy.
+ */
+public final class ScaleSetEvictionPolicy extends ExpandableStringEnum<ScaleSetEvictionPolicy> {
+    /** Static value Delete for ScaleSetEvictionPolicy. */
+    public static final ScaleSetEvictionPolicy DELETE = fromString("Delete");
+
+    /** Static value Deallocate for ScaleSetEvictionPolicy. */
+    public static final ScaleSetEvictionPolicy DEALLOCATE = fromString("Deallocate");
+
+    /**
+     * Creates or finds a ScaleSetEvictionPolicy from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ScaleSetEvictionPolicy
+     */
+    @JsonCreator
+    public static ScaleSetEvictionPolicy fromString(String name) {
+        return fromString(name, ScaleSetEvictionPolicy.class);
+    }
+
+    /**
+     * @return known ScaleSetEvictionPolicy values
+     */
+    public static Collection<ScaleSetEvictionPolicy> values() {
+        return values(ScaleSetEvictionPolicy.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetPriority.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetPriority.java
new file mode 100644
index 000000000000..fd5c6628261e
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/ScaleSetPriority.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.containerservice.v2019_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ScaleSetPriority.
+ */
+public final class ScaleSetPriority extends ExpandableStringEnum<ScaleSetPriority> {
+    /** Static value Low for ScaleSetPriority. */
+    public static final ScaleSetPriority LOW = fromString("Low");
+
+    /** Static value Regular for ScaleSetPriority. */
+    public static final ScaleSetPriority REGULAR = fromString("Regular");
+
+    /**
+     * Creates or finds a ScaleSetPriority from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ScaleSetPriority
+     */
+    @JsonCreator
+    public static ScaleSetPriority fromString(String name) {
+        return fromString(name, ScaleSetPriority.class);
+    }
+
+    /**
+     * @return known ScaleSetPriority values
+     */
+    public static Collection<ScaleSetPriority> values() {
+        return values(ScaleSetPriority.class);
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/TagsObject.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/TagsObject.java
new file mode 100644
index 000000000000..4d33a38ee290
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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.containerservice.v2019_06_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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsImpl.java
new file mode 100644
index 000000000000..6febae092706
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolAvailableVersions;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem;
+
+class AgentPoolAvailableVersionsImpl extends WrapperImpl<AgentPoolAvailableVersionsInner> implements AgentPoolAvailableVersions {
+    private final ContainerServiceManager manager;
+    AgentPoolAvailableVersionsImpl(AgentPoolAvailableVersionsInner inner, ContainerServiceManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem> agentPoolVersions() {
+        return this.inner().agentPoolVersions();
+    }
+
+    @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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsInner.java
new file mode 100644
index 000000000000..30c42fb41de2
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolAvailableVersionsInner.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.containerservice.v2019_06_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The list of available versions for an agent pool.
+ */
+@JsonFlatten
+public class AgentPoolAvailableVersionsInner {
+    /**
+     * Id of the agent pool available versions.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Name of the agent pool available versions.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Type of the agent pool  available versions.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * List of versions available for agent pool.
+     */
+    @JsonProperty(value = "properties.agentPoolVersions")
+    private List<AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem> agentPoolVersions;
+
+    /**
+     * Get id of the agent pool available versions.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get name of the agent pool available versions.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get type of the agent pool  available versions.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get list of versions available for agent pool.
+     *
+     * @return the agentPoolVersions value
+     */
+    public List<AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem> agentPoolVersions() {
+        return this.agentPoolVersions;
+    }
+
+    /**
+     * Set list of versions available for agent pool.
+     *
+     * @param agentPoolVersions the agentPoolVersions value to set
+     * @return the AgentPoolAvailableVersionsInner object itself.
+     */
+    public AgentPoolAvailableVersionsInner withAgentPoolVersions(List<AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem> agentPoolVersions) {
+        this.agentPoolVersions = agentPoolVersions;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolImpl.java
new file mode 100644
index 000000000000..395c20bd5dc9
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPool;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceVMSizeTypes;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OSType;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolType;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ScaleSetPriority;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ScaleSetEvictionPolicy;
+
+class AgentPoolImpl extends CreatableUpdatableImpl<AgentPool, AgentPoolInner, AgentPoolImpl> implements AgentPool, AgentPool.Definition, AgentPool.Update {
+    private final ContainerServiceManager manager;
+    private String resourceGroupName;
+    private String resourceName;
+    private String agentPoolName;
+
+    AgentPoolImpl(String name, ContainerServiceManager manager) {
+        super(name, new AgentPoolInner());
+        this.manager = manager;
+        // Set resource name
+        this.agentPoolName = name;
+        //
+    }
+
+    AgentPoolImpl(AgentPoolInner inner, ContainerServiceManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.agentPoolName = inner.name();
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.resourceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedClusters");
+        this.agentPoolName = IdParsingUtils.getValueFromIdByName(inner.id(), "agentPools");
+        //
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<AgentPool> createResourceAsync() {
+        AgentPoolsInner client = this.manager().inner().agentPools();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.resourceName, this.agentPoolName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<AgentPool> updateResourceAsync() {
+        AgentPoolsInner client = this.manager().inner().agentPools();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.resourceName, this.agentPoolName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<AgentPoolInner> getInnerAsync() {
+        AgentPoolsInner client = this.manager().inner().agentPools();
+        return client.getAsync(this.resourceGroupName, this.resourceName, this.agentPoolName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public AgentPoolType agentPoolType() {
+        return this.inner().agentPoolType();
+    }
+
+    @Override
+    public List<String> availabilityZones() {
+        return this.inner().availabilityZones();
+    }
+
+    @Override
+    public int count() {
+        return this.inner().count();
+    }
+
+    @Override
+    public Boolean enableAutoScaling() {
+        return this.inner().enableAutoScaling();
+    }
+
+    @Override
+    public Boolean enableNodePublicIP() {
+        return this.inner().enableNodePublicIP();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Integer maxCount() {
+        return this.inner().maxCount();
+    }
+
+    @Override
+    public Integer maxPods() {
+        return this.inner().maxPods();
+    }
+
+    @Override
+    public Integer minCount() {
+        return this.inner().minCount();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<String> nodeTaints() {
+        return this.inner().nodeTaints();
+    }
+
+    @Override
+    public String orchestratorVersion() {
+        return this.inner().orchestratorVersion();
+    }
+
+    @Override
+    public Integer osDiskSizeGB() {
+        return this.inner().osDiskSizeGB();
+    }
+
+    @Override
+    public OSType osType() {
+        return this.inner().osType();
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public ScaleSetEvictionPolicy scaleSetEvictionPolicy() {
+        return this.inner().scaleSetEvictionPolicy();
+    }
+
+    @Override
+    public ScaleSetPriority scaleSetPriority() {
+        return this.inner().scaleSetPriority();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ContainerServiceVMSizeTypes vmSize() {
+        return this.inner().vmSize();
+    }
+
+    @Override
+    public String vnetSubnetID() {
+        return this.inner().vnetSubnetID();
+    }
+
+    @Override
+    public AgentPoolImpl withExistingManagedCluster(String resourceGroupName, String resourceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.resourceName = resourceName;
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withCount(int count) {
+        this.inner().withCount(count);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
+        this.inner().withVmSize(vmSize);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withAgentPoolType(AgentPoolType agentPoolType) {
+        this.inner().withAgentPoolType(agentPoolType);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withAvailabilityZones(List<String> availabilityZones) {
+        this.inner().withAvailabilityZones(availabilityZones);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withEnableAutoScaling(Boolean enableAutoScaling) {
+        this.inner().withEnableAutoScaling(enableAutoScaling);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withEnableNodePublicIP(Boolean enableNodePublicIP) {
+        this.inner().withEnableNodePublicIP(enableNodePublicIP);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withMaxCount(Integer maxCount) {
+        this.inner().withMaxCount(maxCount);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withMaxPods(Integer maxPods) {
+        this.inner().withMaxPods(maxPods);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withMinCount(Integer minCount) {
+        this.inner().withMinCount(minCount);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withNodeTaints(List<String> nodeTaints) {
+        this.inner().withNodeTaints(nodeTaints);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withOrchestratorVersion(String orchestratorVersion) {
+        this.inner().withOrchestratorVersion(orchestratorVersion);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withOsDiskSizeGB(Integer osDiskSizeGB) {
+        this.inner().withOsDiskSizeGB(osDiskSizeGB);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withOsType(OSType osType) {
+        this.inner().withOsType(osType);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withScaleSetEvictionPolicy(ScaleSetEvictionPolicy scaleSetEvictionPolicy) {
+        this.inner().withScaleSetEvictionPolicy(scaleSetEvictionPolicy);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withScaleSetPriority(ScaleSetPriority scaleSetPriority) {
+        this.inner().withScaleSetPriority(scaleSetPriority);
+        return this;
+    }
+
+    @Override
+    public AgentPoolImpl withVnetSubnetID(String vnetSubnetID) {
+        this.inner().withVnetSubnetID(vnetSubnetID);
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolInner.java
new file mode 100644
index 000000000000..4a2bfe921bb9
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolInner.java
@@ -0,0 +1,550 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceVMSizeTypes;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OSType;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolType;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ScaleSetPriority;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ScaleSetEvictionPolicy;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
+
+/**
+ * Agent Pool.
+ */
+@JsonFlatten
+public class AgentPoolInner extends SubResource {
+    /**
+     * Number of agents (VMs) to host docker containers. Allowed values must be
+     * in the range of 1 to 100 (inclusive). The default value is 1.
+     */
+    @JsonProperty(value = "properties.count", required = true)
+    private int count;
+
+    /**
+     * Size of agent VMs. Possible values include: 'Standard_A1',
+     * 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
+     * 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
+     * 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
+     * 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
+     * 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
+     * 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
+     * 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
+     * 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
+     * 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
+     * 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
+     * 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
+     * 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
+     * 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
+     * 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
+     * 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
+     * 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
+     * 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
+     * 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo',
+     * 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
+     * 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2',
+     * 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14',
+     * 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2',
+     * 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
+     * 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo',
+     * 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo',
+     * 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
+     * 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3',
+     * 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3',
+     * 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3',
+     * 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
+     * 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3',
+     * 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1',
+     * 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s',
+     * 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2',
+     * 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
+     * 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2',
+     * 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4',
+     * 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3',
+     * 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
+     * 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m',
+     * 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m',
+     * 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s',
+     * 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
+     * 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms',
+     * 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2',
+     * 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
+     * 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2',
+     * 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2',
+     * 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
+     * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
+     * 'Standard_NV6'.
+     */
+    @JsonProperty(value = "properties.vmSize", required = true)
+    private ContainerServiceVMSizeTypes vmSize;
+
+    /**
+     * OS Disk Size in GB to be used to specify the disk size for every machine
+     * in this master/agent pool. If you specify 0, it will apply the default
+     * osDisk size according to the vmSize specified.
+     */
+    @JsonProperty(value = "properties.osDiskSizeGB")
+    private Integer osDiskSizeGB;
+
+    /**
+     * VNet SubnetID specifies the VNet's subnet identifier.
+     */
+    @JsonProperty(value = "properties.vnetSubnetID")
+    private String vnetSubnetID;
+
+    /**
+     * Maximum number of pods that can run on a node.
+     */
+    @JsonProperty(value = "properties.maxPods")
+    private Integer maxPods;
+
+    /**
+     * OsType to be used to specify os type. Choose from Linux and Windows.
+     * Default to Linux. Possible values include: 'Linux', 'Windows'.
+     */
+    @JsonProperty(value = "properties.osType")
+    private OSType osType;
+
+    /**
+     * Maximum number of nodes for auto-scaling.
+     */
+    @JsonProperty(value = "properties.maxCount")
+    private Integer maxCount;
+
+    /**
+     * Minimum number of nodes for auto-scaling.
+     */
+    @JsonProperty(value = "properties.minCount")
+    private Integer minCount;
+
+    /**
+     * Whether to enable auto-scaler.
+     */
+    @JsonProperty(value = "properties.enableAutoScaling")
+    private Boolean enableAutoScaling;
+
+    /**
+     * AgentPoolType represents types of an agent pool. Possible values
+     * include: 'VirtualMachineScaleSets', 'AvailabilitySet'.
+     */
+    @JsonProperty(value = "properties.type")
+    private AgentPoolType agentPoolType;
+
+    /**
+     * Version of orchestrator specified when creating the managed cluster.
+     */
+    @JsonProperty(value = "properties.orchestratorVersion")
+    private String orchestratorVersion;
+
+    /**
+     * The current deployment or provisioning state, which only appears in the
+     * response.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets
+     * AgentPoolType.
+     */
+    @JsonProperty(value = "properties.availabilityZones")
+    private List<String> availabilityZones;
+
+    /**
+     * Enable public IP for nodes.
+     */
+    @JsonProperty(value = "properties.enableNodePublicIP")
+    private Boolean enableNodePublicIP;
+
+    /**
+     * ScaleSetPriority to be used to specify virtual machine scale set
+     * priority. Default to regular. Possible values include: 'Low', 'Regular'.
+     */
+    @JsonProperty(value = "properties.scaleSetPriority")
+    private ScaleSetPriority scaleSetPriority;
+
+    /**
+     * ScaleSetEvictionPolicy to be used to specify eviction policy for low
+     * priority virtual machine scale set. Default to Delete. Possible values
+     * include: 'Delete', 'Deallocate'.
+     */
+    @JsonProperty(value = "properties.scaleSetEvictionPolicy")
+    private ScaleSetEvictionPolicy scaleSetEvictionPolicy;
+
+    /**
+     * Taints added to new nodes during node pool create and scale. For
+     * example, key=value:NoSchedule.
+     */
+    @JsonProperty(value = "properties.nodeTaints")
+    private List<String> nodeTaints;
+
+    /**
+     * 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;
+
+    /**
+     * Resource type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Get number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
+     *
+     * @return the count value
+     */
+    public int count() {
+        return this.count;
+    }
+
+    /**
+     * Set number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
+     *
+     * @param count the count value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withCount(int count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @return the vmSize value
+     */
+    public ContainerServiceVMSizeTypes vmSize() {
+        return this.vmSize;
+    }
+
+    /**
+     * Set size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'.
+     *
+     * @param vmSize the vmSize value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withVmSize(ContainerServiceVMSizeTypes vmSize) {
+        this.vmSize = vmSize;
+        return this;
+    }
+
+    /**
+     * Get oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @return the osDiskSizeGB value
+     */
+    public Integer osDiskSizeGB() {
+        return this.osDiskSizeGB;
+    }
+
+    /**
+     * Set oS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     *
+     * @param osDiskSizeGB the osDiskSizeGB value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withOsDiskSizeGB(Integer osDiskSizeGB) {
+        this.osDiskSizeGB = osDiskSizeGB;
+        return this;
+    }
+
+    /**
+     * Get vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @return the vnetSubnetID value
+     */
+    public String vnetSubnetID() {
+        return this.vnetSubnetID;
+    }
+
+    /**
+     * Set vNet SubnetID specifies the VNet's subnet identifier.
+     *
+     * @param vnetSubnetID the vnetSubnetID value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withVnetSubnetID(String vnetSubnetID) {
+        this.vnetSubnetID = vnetSubnetID;
+        return this;
+    }
+
+    /**
+     * Get maximum number of pods that can run on a node.
+     *
+     * @return the maxPods value
+     */
+    public Integer maxPods() {
+        return this.maxPods;
+    }
+
+    /**
+     * Set maximum number of pods that can run on a node.
+     *
+     * @param maxPods the maxPods value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withMaxPods(Integer maxPods) {
+        this.maxPods = maxPods;
+        return this;
+    }
+
+    /**
+     * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @return the osType value
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @param osType the osType value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * Get maximum number of nodes for auto-scaling.
+     *
+     * @return the maxCount value
+     */
+    public Integer maxCount() {
+        return this.maxCount;
+    }
+
+    /**
+     * Set maximum number of nodes for auto-scaling.
+     *
+     * @param maxCount the maxCount value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withMaxCount(Integer maxCount) {
+        this.maxCount = maxCount;
+        return this;
+    }
+
+    /**
+     * Get minimum number of nodes for auto-scaling.
+     *
+     * @return the minCount value
+     */
+    public Integer minCount() {
+        return this.minCount;
+    }
+
+    /**
+     * Set minimum number of nodes for auto-scaling.
+     *
+     * @param minCount the minCount value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withMinCount(Integer minCount) {
+        this.minCount = minCount;
+        return this;
+    }
+
+    /**
+     * Get whether to enable auto-scaler.
+     *
+     * @return the enableAutoScaling value
+     */
+    public Boolean enableAutoScaling() {
+        return this.enableAutoScaling;
+    }
+
+    /**
+     * Set whether to enable auto-scaler.
+     *
+     * @param enableAutoScaling the enableAutoScaling value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withEnableAutoScaling(Boolean enableAutoScaling) {
+        this.enableAutoScaling = enableAutoScaling;
+        return this;
+    }
+
+    /**
+     * Get agentPoolType represents types of an agent pool. Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'.
+     *
+     * @return the agentPoolType value
+     */
+    public AgentPoolType agentPoolType() {
+        return this.agentPoolType;
+    }
+
+    /**
+     * Set agentPoolType represents types of an agent pool. Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'.
+     *
+     * @param agentPoolType the agentPoolType value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withAgentPoolType(AgentPoolType agentPoolType) {
+        this.agentPoolType = agentPoolType;
+        return this;
+    }
+
+    /**
+     * Get version of orchestrator specified when creating the managed cluster.
+     *
+     * @return the orchestratorVersion value
+     */
+    public String orchestratorVersion() {
+        return this.orchestratorVersion;
+    }
+
+    /**
+     * Set version of orchestrator specified when creating the managed cluster.
+     *
+     * @param orchestratorVersion the orchestratorVersion value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withOrchestratorVersion(String orchestratorVersion) {
+        this.orchestratorVersion = orchestratorVersion;
+        return this;
+    }
+
+    /**
+     * Get the current deployment or provisioning state, which only appears in the response.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
+     *
+     * @return the availabilityZones value
+     */
+    public List<String> availabilityZones() {
+        return this.availabilityZones;
+    }
+
+    /**
+     * Set (PREVIEW) Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType.
+     *
+     * @param availabilityZones the availabilityZones value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withAvailabilityZones(List<String> availabilityZones) {
+        this.availabilityZones = availabilityZones;
+        return this;
+    }
+
+    /**
+     * Get enable public IP for nodes.
+     *
+     * @return the enableNodePublicIP value
+     */
+    public Boolean enableNodePublicIP() {
+        return this.enableNodePublicIP;
+    }
+
+    /**
+     * Set enable public IP for nodes.
+     *
+     * @param enableNodePublicIP the enableNodePublicIP value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withEnableNodePublicIP(Boolean enableNodePublicIP) {
+        this.enableNodePublicIP = enableNodePublicIP;
+        return this;
+    }
+
+    /**
+     * Get scaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Low', 'Regular'.
+     *
+     * @return the scaleSetPriority value
+     */
+    public ScaleSetPriority scaleSetPriority() {
+        return this.scaleSetPriority;
+    }
+
+    /**
+     * Set scaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Low', 'Regular'.
+     *
+     * @param scaleSetPriority the scaleSetPriority value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withScaleSetPriority(ScaleSetPriority scaleSetPriority) {
+        this.scaleSetPriority = scaleSetPriority;
+        return this;
+    }
+
+    /**
+     * Get scaleSetEvictionPolicy to be used to specify eviction policy for low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'.
+     *
+     * @return the scaleSetEvictionPolicy value
+     */
+    public ScaleSetEvictionPolicy scaleSetEvictionPolicy() {
+        return this.scaleSetEvictionPolicy;
+    }
+
+    /**
+     * Set scaleSetEvictionPolicy to be used to specify eviction policy for low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'.
+     *
+     * @param scaleSetEvictionPolicy the scaleSetEvictionPolicy value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withScaleSetEvictionPolicy(ScaleSetEvictionPolicy scaleSetEvictionPolicy) {
+        this.scaleSetEvictionPolicy = scaleSetEvictionPolicy;
+        return this;
+    }
+
+    /**
+     * Get taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule.
+     *
+     * @return the nodeTaints value
+     */
+    public List<String> nodeTaints() {
+        return this.nodeTaints;
+    }
+
+    /**
+     * Set taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule.
+     *
+     * @param nodeTaints the nodeTaints value to set
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withNodeTaints(List<String> nodeTaints) {
+        this.nodeTaints = nodeTaints;
+        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;
+    }
+
+    /**
+     * Get resource type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileImpl.java
new file mode 100644
index 000000000000..433bbdc084bf
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolUpgradeProfile;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OSType;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolUpgradeProfilePropertiesUpgradesItem;
+
+class AgentPoolUpgradeProfileImpl extends WrapperImpl<AgentPoolUpgradeProfileInner> implements AgentPoolUpgradeProfile {
+    private final ContainerServiceManager manager;
+    AgentPoolUpgradeProfileImpl(AgentPoolUpgradeProfileInner inner, ContainerServiceManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kubernetesVersion() {
+        return this.inner().kubernetesVersion();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public OSType osType() {
+        return this.inner().osType();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades() {
+        return this.inner().upgrades();
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileInner.java
new file mode 100644
index 000000000000..438939c52763
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolUpgradeProfileInner.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.OSType;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolUpgradeProfilePropertiesUpgradesItem;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The list of available upgrades for an agent pool.
+ */
+@JsonFlatten
+public class AgentPoolUpgradeProfileInner {
+    /**
+     * Id of the agent pool upgrade profile.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Name of the agent pool upgrade profile.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Type of the agent pool upgrade profile.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * Kubernetes version (major, minor, patch).
+     */
+    @JsonProperty(value = "properties.kubernetesVersion", required = true)
+    private String kubernetesVersion;
+
+    /**
+     * OsType to be used to specify os type. Choose from Linux and Windows.
+     * Default to Linux. Possible values include: 'Linux', 'Windows'.
+     */
+    @JsonProperty(value = "properties.osType", required = true)
+    private OSType osType;
+
+    /**
+     * List of orchestrator types and versions available for upgrade.
+     */
+    @JsonProperty(value = "properties.upgrades")
+    private List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades;
+
+    /**
+     * Get id of the agent pool upgrade profile.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get name of the agent pool upgrade profile.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get type of the agent pool upgrade profile.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get kubernetes version (major, minor, patch).
+     *
+     * @return the kubernetesVersion value
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set kubernetes version (major, minor, patch).
+     *
+     * @param kubernetesVersion the kubernetesVersion value to set
+     * @return the AgentPoolUpgradeProfileInner object itself.
+     */
+    public AgentPoolUpgradeProfileInner withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @return the osType value
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'.
+     *
+     * @param osType the osType value to set
+     * @return the AgentPoolUpgradeProfileInner object itself.
+     */
+    public AgentPoolUpgradeProfileInner withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * Get list of orchestrator types and versions available for upgrade.
+     *
+     * @return the upgrades value
+     */
+    public List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades() {
+        return this.upgrades;
+    }
+
+    /**
+     * Set list of orchestrator types and versions available for upgrade.
+     *
+     * @param upgrades the upgrades value to set
+     * @return the AgentPoolUpgradeProfileInner object itself.
+     */
+    public AgentPoolUpgradeProfileInner withUpgrades(List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades) {
+        this.upgrades = upgrades;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java
new file mode 100644
index 000000000000..911bee5b30f7
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPool;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolUpgradeProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPoolAvailableVersions;
+
+class AgentPoolsImpl extends WrapperImpl<AgentPoolsInner> implements AgentPools {
+    private final ContainerServiceManager manager;
+
+    AgentPoolsImpl(ContainerServiceManager manager) {
+        super(manager.inner().agentPools());
+        this.manager = manager;
+    }
+
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public AgentPoolImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private AgentPoolImpl wrapModel(AgentPoolInner inner) {
+        return  new AgentPoolImpl(inner, manager());
+    }
+
+    private AgentPoolImpl wrapModel(String name) {
+        return new AgentPoolImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<AgentPool> listAsync(final String resourceGroupName, final String resourceName) {
+        AgentPoolsInner client = this.inner();
+        return client.listAsync(resourceGroupName, resourceName)
+        .flatMapIterable(new Func1<Page<AgentPoolInner>, Iterable<AgentPoolInner>>() {
+            @Override
+            public Iterable<AgentPoolInner> call(Page<AgentPoolInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AgentPoolInner, AgentPool>() {
+            @Override
+            public AgentPool call(AgentPoolInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<AgentPool> getAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        AgentPoolsInner client = this.inner();
+        return client.getAsync(resourceGroupName, resourceName, agentPoolName)
+        .flatMap(new Func1<AgentPoolInner, Observable<AgentPool>>() {
+            @Override
+            public Observable<AgentPool> call(AgentPoolInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((AgentPool)wrapModel(inner));
+                }
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        AgentPoolsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, resourceName, agentPoolName).toCompletable();
+    }
+
+    @Override
+    public Observable<AgentPoolUpgradeProfile> getUpgradeProfileAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        AgentPoolsInner client = this.inner();
+        return client.getUpgradeProfileAsync(resourceGroupName, resourceName, agentPoolName)
+        .map(new Func1<AgentPoolUpgradeProfileInner, AgentPoolUpgradeProfile>() {
+            @Override
+            public AgentPoolUpgradeProfile call(AgentPoolUpgradeProfileInner inner) {
+                return new AgentPoolUpgradeProfileImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        AgentPoolsInner client = this.inner();
+        return client.getAvailableAgentPoolVersionsAsync(resourceGroupName, resourceName, agentPoolName)
+        .map(new Func1<AgentPoolAvailableVersionsInner, AgentPoolAvailableVersions>() {
+            @Override
+            public AgentPoolAvailableVersions call(AgentPoolAvailableVersionsInner inner) {
+                return new AgentPoolAvailableVersionsImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java
new file mode 100644
index 000000000000..b95dc4cafbe0
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java
@@ -0,0 +1,991 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_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 AgentPools.
+ */
+public class AgentPoolsInner {
+    /** The Retrofit service to perform REST calls. */
+    private AgentPoolsService service;
+    /** The service client containing this operation class. */
+    private ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of AgentPoolsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public AgentPoolsInner(Retrofit retrofit, ContainerServiceManagementClientImpl client) {
+        this.service = retrofit.create(AgentPoolsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AgentPools to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface AgentPoolsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Body AgentPoolInner 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.containerservice.v2019_06_01.AgentPools beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Body AgentPoolInner 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.containerservice.v2019_06_01.AgentPools delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools getUpgradeProfile" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/upgradeProfiles/default")
+        Observable<Response<ResponseBody>> getUpgradeProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools getAvailableAgentPoolVersions" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/availableAgentPoolVersions")
+        Observable<Response<ResponseBody>> getAvailableAgentPoolVersions(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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;AgentPoolInner&gt; object if successful.
+     */
+    public PagedList<AgentPoolInner> list(final String resourceGroupName, final String resourceName) {
+        ServiceResponse<Page<AgentPoolInner>> response = listSinglePageAsync(resourceGroupName, resourceName).toBlocking().single();
+        return new PagedList<AgentPoolInner>(response.body()) {
+            @Override
+            public Page<AgentPoolInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<AgentPoolInner>> listAsync(final String resourceGroupName, final String resourceName, final ListOperationCallback<AgentPoolInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, resourceName),
+            new Func1<String, Observable<ServiceResponse<Page<AgentPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AgentPoolInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AgentPoolInner&gt; object
+     */
+    public Observable<Page<AgentPoolInner>> listAsync(final String resourceGroupName, final String resourceName) {
+        return listWithServiceResponseAsync(resourceGroupName, resourceName)
+            .map(new Func1<ServiceResponse<Page<AgentPoolInner>>, Page<AgentPoolInner>>() {
+                @Override
+                public Page<AgentPoolInner> call(ServiceResponse<Page<AgentPoolInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AgentPoolInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AgentPoolInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String resourceName) {
+        return listSinglePageAsync(resourceGroupName, resourceName)
+            .concatMap(new Func1<ServiceResponse<Page<AgentPoolInner>>, Observable<ServiceResponse<Page<AgentPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AgentPoolInner>>> call(ServiceResponse<Page<AgentPoolInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+    ServiceResponse<PageImpl<AgentPoolInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<AgentPoolInner>> * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AgentPoolInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AgentPoolInner>>> listSinglePageAsync(final String resourceGroupName, final String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.list(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AgentPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AgentPoolInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AgentPoolInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AgentPoolInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AgentPoolInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AgentPoolInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AgentPoolInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the agent pool.
+     * Gets the details of the agent pool by managed cluster and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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 AgentPoolInner object if successful.
+     */
+    public AgentPoolInner get(String resourceGroupName, String resourceName, String agentPoolName) {
+        return getWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the agent pool.
+     * Gets the details of the agent pool by managed cluster and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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<AgentPoolInner> getAsync(String resourceGroupName, String resourceName, String agentPoolName, final ServiceCallback<AgentPoolInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName), serviceCallback);
+    }
+
+    /**
+     * Gets the agent pool.
+     * Gets the details of the agent pool by managed cluster and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolInner object
+     */
+    public Observable<AgentPoolInner> getAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        return getWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).map(new Func1<ServiceResponse<AgentPoolInner>, AgentPoolInner>() {
+            @Override
+            public AgentPoolInner call(ServiceResponse<AgentPoolInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the agent pool.
+     * Gets the details of the agent pool by managed cluster and resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolInner object
+     */
+    public Observable<ServiceResponse<AgentPoolInner>> getWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (agentPoolName == null) {
+            throw new IllegalArgumentException("Parameter agentPoolName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.get(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AgentPoolInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AgentPoolInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AgentPoolInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AgentPoolInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AgentPoolInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AgentPoolInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent 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 AgentPoolInner object if successful.
+     */
+    public AgentPoolInner createOrUpdate(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent 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<AgentPoolInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner parameters, final ServiceCallback<AgentPoolInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<AgentPoolInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName, parameters).map(new Func1<ServiceResponse<AgentPoolInner>, AgentPoolInner>() {
+            @Override
+            public AgentPoolInner call(ServiceResponse<AgentPoolInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<AgentPoolInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (agentPoolName == null) {
+            throw new IllegalArgumentException("Parameter agentPoolName 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 = "2019-06-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<AgentPoolInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent 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 AgentPoolInner object if successful.
+     */
+    public AgentPoolInner beginCreateOrUpdate(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent 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<AgentPoolInner> beginCreateOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner parameters, final ServiceCallback<AgentPoolInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolInner object
+     */
+    public Observable<AgentPoolInner> beginCreateOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName, parameters).map(new Func1<ServiceResponse<AgentPoolInner>, AgentPoolInner>() {
+            @Override
+            public AgentPoolInner call(ServiceResponse<AgentPoolInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an agent pool.
+     * Creates or updates an agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param parameters Parameters supplied to the Create or Update an agent pool operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolInner object
+     */
+    public Observable<ServiceResponse<AgentPoolInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName, AgentPoolInner 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (agentPoolName == null) {
+            throw new IllegalArgumentException("Parameter agentPoolName 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 = "2019-06-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AgentPoolInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AgentPoolInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AgentPoolInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AgentPoolInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AgentPoolInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AgentPoolInner>() { }.getType())
+                .register(201, new TypeToken<AgentPoolInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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 resourceName, String agentPoolName) {
+        deleteWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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 resourceName, String agentPoolName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName), serviceCallback);
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (agentPoolName == null) {
+            throw new IllegalArgumentException("Parameter agentPoolName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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 resourceName, String agentPoolName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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 resourceName, String agentPoolName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName), serviceCallback);
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an agent pool.
+     * Deletes the agent pool in the specified managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (agentPoolName == null) {
+            throw new IllegalArgumentException("Parameter agentPoolName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets upgrade profile for an agent pool.
+     * Gets the details of the upgrade profile for an agent pool with a specified resource group and managed cluster name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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 AgentPoolUpgradeProfileInner object if successful.
+     */
+    public AgentPoolUpgradeProfileInner getUpgradeProfile(String resourceGroupName, String resourceName, String agentPoolName) {
+        return getUpgradeProfileWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets upgrade profile for an agent pool.
+     * Gets the details of the upgrade profile for an agent pool with a specified resource group and managed cluster name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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<AgentPoolUpgradeProfileInner> getUpgradeProfileAsync(String resourceGroupName, String resourceName, String agentPoolName, final ServiceCallback<AgentPoolUpgradeProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getUpgradeProfileWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName), serviceCallback);
+    }
+
+    /**
+     * Gets upgrade profile for an agent pool.
+     * Gets the details of the upgrade profile for an agent pool with a specified resource group and managed cluster name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolUpgradeProfileInner object
+     */
+    public Observable<AgentPoolUpgradeProfileInner> getUpgradeProfileAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        return getUpgradeProfileWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).map(new Func1<ServiceResponse<AgentPoolUpgradeProfileInner>, AgentPoolUpgradeProfileInner>() {
+            @Override
+            public AgentPoolUpgradeProfileInner call(ServiceResponse<AgentPoolUpgradeProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets upgrade profile for an agent pool.
+     * Gets the details of the upgrade profile for an agent pool with a specified resource group and managed cluster name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolUpgradeProfileInner object
+     */
+    public Observable<ServiceResponse<AgentPoolUpgradeProfileInner>> getUpgradeProfileWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (agentPoolName == null) {
+            throw new IllegalArgumentException("Parameter agentPoolName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.getUpgradeProfile(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AgentPoolUpgradeProfileInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AgentPoolUpgradeProfileInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AgentPoolUpgradeProfileInner> clientResponse = getUpgradeProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AgentPoolUpgradeProfileInner> getUpgradeProfileDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AgentPoolUpgradeProfileInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AgentPoolUpgradeProfileInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of supported versions for the specified agent pool.
+     * Gets a list of supported versions for the specified agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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 AgentPoolAvailableVersionsInner object if successful.
+     */
+    public AgentPoolAvailableVersionsInner getAvailableAgentPoolVersions(String resourceGroupName, String resourceName, String agentPoolName) {
+        return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a list of supported versions for the specified agent pool.
+     * Gets a list of supported versions for the specified agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent 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<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName, final ServiceCallback<AgentPoolAvailableVersionsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName), serviceCallback);
+    }
+
+    /**
+     * Gets a list of supported versions for the specified agent pool.
+     * Gets a list of supported versions for the specified agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolAvailableVersionsInner object
+     */
+    public Observable<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).map(new Func1<ServiceResponse<AgentPoolAvailableVersionsInner>, AgentPoolAvailableVersionsInner>() {
+            @Override
+            public AgentPoolAvailableVersionsInner call(ServiceResponse<AgentPoolAvailableVersionsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a list of supported versions for the specified agent pool.
+     * Gets a list of supported versions for the specified agent pool.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AgentPoolAvailableVersionsInner object
+     */
+    public Observable<ServiceResponse<AgentPoolAvailableVersionsInner>> getAvailableAgentPoolVersionsWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (agentPoolName == null) {
+            throw new IllegalArgumentException("Parameter agentPoolName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.getAvailableAgentPoolVersions(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AgentPoolAvailableVersionsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AgentPoolAvailableVersionsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AgentPoolAvailableVersionsInner> clientResponse = getAvailableAgentPoolVersionsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AgentPoolAvailableVersionsInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AgentPoolAvailableVersionsInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @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;AgentPoolInner&gt; object if successful.
+     */
+    public PagedList<AgentPoolInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AgentPoolInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AgentPoolInner>(response.body()) {
+            @Override
+            public Page<AgentPoolInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @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<AgentPoolInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AgentPoolInner>> serviceFuture, final ListOperationCallback<AgentPoolInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AgentPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AgentPoolInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AgentPoolInner&gt; object
+     */
+    public Observable<Page<AgentPoolInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AgentPoolInner>>, Page<AgentPoolInner>>() {
+                @Override
+                public Page<AgentPoolInner> call(ServiceResponse<Page<AgentPoolInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AgentPoolInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AgentPoolInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AgentPoolInner>>, Observable<ServiceResponse<Page<AgentPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AgentPoolInner>>> call(ServiceResponse<Page<AgentPoolInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of agent pools in the specified managed cluster.
+     * Gets a list of agent pools in the specified managed cluster. The operation returns properties of each agent pool.
+     *
+    ServiceResponse<PageImpl<AgentPoolInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AgentPoolInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AgentPoolInner>>> 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<AgentPoolInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AgentPoolInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AgentPoolInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AgentPoolInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AgentPoolInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AgentPoolInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AgentPoolInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceImpl.java
new file mode 100644
index 000000000000..ced8fc15bbca
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerService;
+import rx.Observable;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceOrchestratorProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceCustomProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceServicePrincipalProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceMasterProfile;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceAgentPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceWindowsProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceLinuxProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceDiagnosticsProfile;
+
+class ContainerServiceImpl extends GroupableResourceCoreImpl<ContainerService, ContainerServiceInner, ContainerServiceImpl, ContainerServiceManager> implements ContainerService, ContainerService.Definition, ContainerService.Update {
+    ContainerServiceImpl(String name, ContainerServiceInner inner, ContainerServiceManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ContainerService> createResourceAsync() {
+        ContainerServicesInner client = this.manager().inner().containerServices();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ContainerService> updateResourceAsync() {
+        ContainerServicesInner client = this.manager().inner().containerServices();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ContainerServiceInner> getInnerAsync() {
+        ContainerServicesInner client = this.manager().inner().containerServices();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<ContainerServiceAgentPoolProfile> agentPoolProfiles() {
+        return this.inner().agentPoolProfiles();
+    }
+
+    @Override
+    public ContainerServiceCustomProfile customProfile() {
+        return this.inner().customProfile();
+    }
+
+    @Override
+    public ContainerServiceDiagnosticsProfile diagnosticsProfile() {
+        return this.inner().diagnosticsProfile();
+    }
+
+    @Override
+    public ContainerServiceLinuxProfile linuxProfile() {
+        return this.inner().linuxProfile();
+    }
+
+    @Override
+    public ContainerServiceMasterProfile masterProfile() {
+        return this.inner().masterProfile();
+    }
+
+    @Override
+    public ContainerServiceOrchestratorProfile orchestratorProfile() {
+        return this.inner().orchestratorProfile();
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public ContainerServiceServicePrincipalProfile servicePrincipalProfile() {
+        return this.inner().servicePrincipalProfile();
+    }
+
+    @Override
+    public ContainerServiceWindowsProfile windowsProfile() {
+        return this.inner().windowsProfile();
+    }
+
+    @Override
+    public ContainerServiceImpl withLinuxProfile(ContainerServiceLinuxProfile linuxProfile) {
+        this.inner().withLinuxProfile(linuxProfile);
+        return this;
+    }
+
+    @Override
+    public ContainerServiceImpl withMasterProfile(ContainerServiceMasterProfile masterProfile) {
+        this.inner().withMasterProfile(masterProfile);
+        return this;
+    }
+
+    @Override
+    public ContainerServiceImpl withOrchestratorProfile(ContainerServiceOrchestratorProfile orchestratorProfile) {
+        this.inner().withOrchestratorProfile(orchestratorProfile);
+        return this;
+    }
+
+    @Override
+    public ContainerServiceImpl withAgentPoolProfiles(List<ContainerServiceAgentPoolProfile> agentPoolProfiles) {
+        this.inner().withAgentPoolProfiles(agentPoolProfiles);
+        return this;
+    }
+
+    @Override
+    public ContainerServiceImpl withCustomProfile(ContainerServiceCustomProfile customProfile) {
+        this.inner().withCustomProfile(customProfile);
+        return this;
+    }
+
+    @Override
+    public ContainerServiceImpl withDiagnosticsProfile(ContainerServiceDiagnosticsProfile diagnosticsProfile) {
+        this.inner().withDiagnosticsProfile(diagnosticsProfile);
+        return this;
+    }
+
+    @Override
+    public ContainerServiceImpl withServicePrincipalProfile(ContainerServiceServicePrincipalProfile servicePrincipalProfile) {
+        this.inner().withServicePrincipalProfile(servicePrincipalProfile);
+        return this;
+    }
+
+    @Override
+    public ContainerServiceImpl withWindowsProfile(ContainerServiceWindowsProfile windowsProfile) {
+        this.inner().withWindowsProfile(windowsProfile);
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceInner.java
new file mode 100644
index 000000000000..0624b5e15701
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceInner.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceOrchestratorProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceCustomProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceServicePrincipalProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceMasterProfile;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceAgentPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceWindowsProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceLinuxProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceDiagnosticsProfile;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * Container service.
+ */
+@JsonFlatten
+public class ContainerServiceInner extends Resource {
+    /**
+     * The current deployment or provisioning state, which only appears in the
+     * response.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * Profile for the container service orchestrator.
+     */
+    @JsonProperty(value = "properties.orchestratorProfile", required = true)
+    private ContainerServiceOrchestratorProfile orchestratorProfile;
+
+    /**
+     * Properties to configure a custom container service cluster.
+     */
+    @JsonProperty(value = "properties.customProfile")
+    private ContainerServiceCustomProfile customProfile;
+
+    /**
+     * Information about a service principal identity for the cluster to use
+     * for manipulating Azure APIs. Exact one of secret or keyVaultSecretRef
+     * need to be specified.
+     */
+    @JsonProperty(value = "properties.servicePrincipalProfile")
+    private ContainerServiceServicePrincipalProfile servicePrincipalProfile;
+
+    /**
+     * Profile for the container service master.
+     */
+    @JsonProperty(value = "properties.masterProfile", required = true)
+    private ContainerServiceMasterProfile masterProfile;
+
+    /**
+     * Properties of the agent pool.
+     */
+    @JsonProperty(value = "properties.agentPoolProfiles")
+    private List<ContainerServiceAgentPoolProfile> agentPoolProfiles;
+
+    /**
+     * Profile for Windows VMs in the container service cluster.
+     */
+    @JsonProperty(value = "properties.windowsProfile")
+    private ContainerServiceWindowsProfile windowsProfile;
+
+    /**
+     * Profile for Linux VMs in the container service cluster.
+     */
+    @JsonProperty(value = "properties.linuxProfile", required = true)
+    private ContainerServiceLinuxProfile linuxProfile;
+
+    /**
+     * Profile for diagnostics in the container service cluster.
+     */
+    @JsonProperty(value = "properties.diagnosticsProfile")
+    private ContainerServiceDiagnosticsProfile diagnosticsProfile;
+
+    /**
+     * Get the current deployment or provisioning state, which only appears in the response.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get profile for the container service orchestrator.
+     *
+     * @return the orchestratorProfile value
+     */
+    public ContainerServiceOrchestratorProfile orchestratorProfile() {
+        return this.orchestratorProfile;
+    }
+
+    /**
+     * Set profile for the container service orchestrator.
+     *
+     * @param orchestratorProfile the orchestratorProfile value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withOrchestratorProfile(ContainerServiceOrchestratorProfile orchestratorProfile) {
+        this.orchestratorProfile = orchestratorProfile;
+        return this;
+    }
+
+    /**
+     * Get properties to configure a custom container service cluster.
+     *
+     * @return the customProfile value
+     */
+    public ContainerServiceCustomProfile customProfile() {
+        return this.customProfile;
+    }
+
+    /**
+     * Set properties to configure a custom container service cluster.
+     *
+     * @param customProfile the customProfile value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withCustomProfile(ContainerServiceCustomProfile customProfile) {
+        this.customProfile = customProfile;
+        return this;
+    }
+
+    /**
+     * Get information about a service principal identity for the cluster to use for manipulating Azure APIs. Exact one of secret or keyVaultSecretRef need to be specified.
+     *
+     * @return the servicePrincipalProfile value
+     */
+    public ContainerServiceServicePrincipalProfile servicePrincipalProfile() {
+        return this.servicePrincipalProfile;
+    }
+
+    /**
+     * Set information about a service principal identity for the cluster to use for manipulating Azure APIs. Exact one of secret or keyVaultSecretRef need to be specified.
+     *
+     * @param servicePrincipalProfile the servicePrincipalProfile value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withServicePrincipalProfile(ContainerServiceServicePrincipalProfile servicePrincipalProfile) {
+        this.servicePrincipalProfile = servicePrincipalProfile;
+        return this;
+    }
+
+    /**
+     * Get profile for the container service master.
+     *
+     * @return the masterProfile value
+     */
+    public ContainerServiceMasterProfile masterProfile() {
+        return this.masterProfile;
+    }
+
+    /**
+     * Set profile for the container service master.
+     *
+     * @param masterProfile the masterProfile value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withMasterProfile(ContainerServiceMasterProfile masterProfile) {
+        this.masterProfile = masterProfile;
+        return this;
+    }
+
+    /**
+     * Get properties of the agent pool.
+     *
+     * @return the agentPoolProfiles value
+     */
+    public List<ContainerServiceAgentPoolProfile> agentPoolProfiles() {
+        return this.agentPoolProfiles;
+    }
+
+    /**
+     * Set properties of the agent pool.
+     *
+     * @param agentPoolProfiles the agentPoolProfiles value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withAgentPoolProfiles(List<ContainerServiceAgentPoolProfile> agentPoolProfiles) {
+        this.agentPoolProfiles = agentPoolProfiles;
+        return this;
+    }
+
+    /**
+     * Get profile for Windows VMs in the container service cluster.
+     *
+     * @return the windowsProfile value
+     */
+    public ContainerServiceWindowsProfile windowsProfile() {
+        return this.windowsProfile;
+    }
+
+    /**
+     * Set profile for Windows VMs in the container service cluster.
+     *
+     * @param windowsProfile the windowsProfile value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withWindowsProfile(ContainerServiceWindowsProfile windowsProfile) {
+        this.windowsProfile = windowsProfile;
+        return this;
+    }
+
+    /**
+     * Get profile for Linux VMs in the container service cluster.
+     *
+     * @return the linuxProfile value
+     */
+    public ContainerServiceLinuxProfile linuxProfile() {
+        return this.linuxProfile;
+    }
+
+    /**
+     * Set profile for Linux VMs in the container service cluster.
+     *
+     * @param linuxProfile the linuxProfile value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withLinuxProfile(ContainerServiceLinuxProfile linuxProfile) {
+        this.linuxProfile = linuxProfile;
+        return this;
+    }
+
+    /**
+     * Get profile for diagnostics in the container service cluster.
+     *
+     * @return the diagnosticsProfile value
+     */
+    public ContainerServiceDiagnosticsProfile diagnosticsProfile() {
+        return this.diagnosticsProfile;
+    }
+
+    /**
+     * Set profile for diagnostics in the container service cluster.
+     *
+     * @param diagnosticsProfile the diagnosticsProfile value to set
+     * @return the ContainerServiceInner object itself.
+     */
+    public ContainerServiceInner withDiagnosticsProfile(ContainerServiceDiagnosticsProfile diagnosticsProfile) {
+        this.diagnosticsProfile = diagnosticsProfile;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManagementClientImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManagementClientImpl.java
new file mode 100644
index 000000000000..6a3352c8c4f8
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManagementClientImpl.java
@@ -0,0 +1,239 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the ContainerServiceManagementClientImpl class.
+ */
+public class ContainerServiceManagementClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. */
+    private String subscriptionId;
+
+    /**
+     * Gets Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets Subscription credentials which uniquely identify 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 ContainerServiceManagementClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** 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 ContainerServiceManagementClientImpl 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 ContainerServiceManagementClientImpl 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 ContainerServiceManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The OpenShiftManagedClustersInner object to access its operations.
+     */
+    private OpenShiftManagedClustersInner openShiftManagedClusters;
+
+    /**
+     * Gets the OpenShiftManagedClustersInner object to access its operations.
+     * @return the OpenShiftManagedClustersInner object.
+     */
+    public OpenShiftManagedClustersInner openShiftManagedClusters() {
+        return this.openShiftManagedClusters;
+    }
+
+    /**
+     * The ContainerServicesInner object to access its operations.
+     */
+    private ContainerServicesInner containerServices;
+
+    /**
+     * Gets the ContainerServicesInner object to access its operations.
+     * @return the ContainerServicesInner object.
+     */
+    public ContainerServicesInner containerServices() {
+        return this.containerServices;
+    }
+
+    /**
+     * 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 ManagedClustersInner object to access its operations.
+     */
+    private ManagedClustersInner managedClusters;
+
+    /**
+     * Gets the ManagedClustersInner object to access its operations.
+     * @return the ManagedClustersInner object.
+     */
+    public ManagedClustersInner managedClusters() {
+        return this.managedClusters;
+    }
+
+    /**
+     * The AgentPoolsInner object to access its operations.
+     */
+    private AgentPoolsInner agentPools;
+
+    /**
+     * Gets the AgentPoolsInner object to access its operations.
+     * @return the AgentPoolsInner object.
+     */
+    public AgentPoolsInner agentPools() {
+        return this.agentPools;
+    }
+
+    /**
+     * Initializes an instance of ContainerServiceManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public ContainerServiceManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of ContainerServiceManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public ContainerServiceManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of ContainerServiceManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public ContainerServiceManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.openShiftManagedClusters = new OpenShiftManagedClustersInner(restClient().retrofit(), this);
+        this.containerServices = new ContainerServicesInner(restClient().retrofit(), this);
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.managedClusters = new ManagedClustersInner(restClient().retrofit(), this);
+        this.agentPools = new AgentPoolsInner(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(), "ContainerServiceManagementClient", "2019-06-01");
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManager.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManager.java
new file mode 100644
index 000000000000..1062e81e14d6
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServiceManager.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.containerservice.v2019_06_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.containerservice.v2019_06_01.OpenShiftManagedClusters;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServices;
+import com.microsoft.azure.management.containerservice.v2019_06_01.Operations;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters;
+import com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure ContainerService resource management.
+ */
+public final class ContainerServiceManager extends ManagerCore<ContainerServiceManager, ContainerServiceManagementClientImpl> {
+    private OpenShiftManagedClusters openShiftManagedClusters;
+    private ContainerServices containerServices;
+    private Operations operations;
+    private ManagedClusters managedClusters;
+    private AgentPools agentPools;
+    /**
+    * Get a Configurable instance that can be used to create ContainerServiceManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new ContainerServiceManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of ContainerServiceManager that exposes ContainerService resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the ContainerServiceManager
+    */
+    public static ContainerServiceManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new ContainerServiceManager(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 ContainerServiceManager that exposes ContainerService resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the ContainerServiceManager
+    */
+    public static ContainerServiceManager authenticate(RestClient restClient, String subscriptionId) {
+        return new ContainerServiceManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of ContainerServiceManager that exposes ContainerService management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing ContainerService management API entry points that work across subscriptions
+        */
+        ContainerServiceManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage OpenShiftManagedClusters.
+     */
+    public OpenShiftManagedClusters openShiftManagedClusters() {
+        if (this.openShiftManagedClusters == null) {
+            this.openShiftManagedClusters = new OpenShiftManagedClustersImpl(this);
+        }
+        return this.openShiftManagedClusters;
+    }
+
+    /**
+     * @return Entry point to manage ContainerServices.
+     */
+    public ContainerServices containerServices() {
+        if (this.containerServices == null) {
+            this.containerServices = new ContainerServicesImpl(this);
+        }
+        return this.containerServices;
+    }
+
+    /**
+     * @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 ManagedClusters.
+     */
+    public ManagedClusters managedClusters() {
+        if (this.managedClusters == null) {
+            this.managedClusters = new ManagedClustersImpl(this);
+        }
+        return this.managedClusters;
+    }
+
+    /**
+     * @return Entry point to manage AgentPools.
+     */
+    public AgentPools agentPools() {
+        if (this.agentPools == null) {
+            this.agentPools = new AgentPoolsImpl(this);
+        }
+        return this.agentPools;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public ContainerServiceManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return ContainerServiceManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private ContainerServiceManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new ContainerServiceManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesImpl.java
new file mode 100644
index 000000000000..93b2a7b469e1
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesImpl.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.
+ * def
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServices;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerService;
+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.containerservice.v2019_06_01.OrchestratorVersionProfileListResult;
+
+class ContainerServicesImpl extends GroupableResourcesCoreImpl<ContainerService, ContainerServiceImpl, ContainerServiceInner, ContainerServicesInner, ContainerServiceManager>  implements ContainerServices {
+    protected ContainerServicesImpl(ContainerServiceManager manager) {
+        super(manager.inner().containerServices(), manager);
+    }
+
+    @Override
+    protected Observable<ContainerServiceInner> getInnerAsync(String resourceGroupName, String name) {
+        ContainerServicesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ContainerServicesInner 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<ContainerService> listByResourceGroup(String resourceGroupName) {
+        ContainerServicesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ContainerService> listByResourceGroupAsync(String resourceGroupName) {
+        ContainerServicesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ContainerServiceInner>, Iterable<ContainerServiceInner>>() {
+            @Override
+            public Iterable<ContainerServiceInner> call(Page<ContainerServiceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ContainerServiceInner, ContainerService>() {
+            @Override
+            public ContainerService call(ContainerServiceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ContainerService> list() {
+        ContainerServicesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ContainerService> listAsync() {
+        ContainerServicesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ContainerServiceInner>, Iterable<ContainerServiceInner>>() {
+            @Override
+            public Iterable<ContainerServiceInner> call(Page<ContainerServiceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ContainerServiceInner, ContainerService>() {
+            @Override
+            public ContainerService call(ContainerServiceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ContainerServiceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected ContainerServiceImpl wrapModel(ContainerServiceInner inner) {
+        return  new ContainerServiceImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ContainerServiceImpl wrapModel(String name) {
+        return new ContainerServiceImpl(name, new ContainerServiceInner(), this.manager());
+    }
+
+    @Override
+    public Observable<OrchestratorVersionProfileListResult> listOrchestratorsAsync(String location) {
+        ContainerServicesInner client = this.inner();
+        return client.listOrchestratorsAsync(location)
+        .map(new Func1<OrchestratorVersionProfileListResultInner, OrchestratorVersionProfileListResult>() {
+            @Override
+            public OrchestratorVersionProfileListResult call(OrchestratorVersionProfileListResultInner inner) {
+                return new OrchestratorVersionProfileListResultImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesInner.java
new file mode 100644
index 000000000000..1e8f1826d1dd
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ContainerServicesInner.java
@@ -0,0 +1,1152 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_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 ContainerServices.
+ */
+public class ContainerServicesInner implements InnerSupportsGet<ContainerServiceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ContainerServiceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ContainerServicesService service;
+    /** The service client containing this operation class. */
+    private ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ContainerServicesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ContainerServicesInner(Retrofit retrofit, ContainerServiceManagementClientImpl client) {
+        this.service = retrofit.create(ContainerServicesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServices to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ContainerServicesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServices list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/containerServices")
+        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.containerservice.v2019_06_01.ContainerServices createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("containerServiceName") String containerServiceName, @Path("subscriptionId") String subscriptionId, @Body ContainerServiceInner 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.containerservice.v2019_06_01.ContainerServices beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("containerServiceName") String containerServiceName, @Path("subscriptionId") String subscriptionId, @Body ContainerServiceInner 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.containerservice.v2019_06_01.ContainerServices getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("containerServiceName") String containerServiceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServices delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("containerServiceName") String containerServiceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServices beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("containerServiceName") String containerServiceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServices listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices")
+        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.containerservice.v2019_06_01.ContainerServices listOrchestrators" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/orchestrators")
+        Observable<Response<ResponseBody>> listOrchestrators(@Path("subscriptionId") String subscriptionId, @Path("location") String location, @Query("api-version") String apiVersion, @Query("resource-type") String resourceType, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServices 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.containerservice.v2019_06_01.ContainerServices listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ContainerServiceInner&gt; object if successful.
+     */
+    public PagedList<ContainerServiceInner> list() {
+        ServiceResponse<Page<ContainerServiceInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ContainerServiceInner>(response.body()) {
+            @Override
+            public Page<ContainerServiceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ContainerServiceInner>> listAsync(final ListOperationCallback<ContainerServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<Page<ContainerServiceInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Page<ContainerServiceInner>>() {
+                @Override
+                public Page<ContainerServiceInner> call(ServiceResponse<Page<ContainerServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(ServiceResponse<Page<ContainerServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ContainerServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2017-07-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ContainerServiceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ContainerServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ContainerServiceInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ContainerServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ContainerServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container Service 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 ContainerServiceInner object if successful.
+     */
+    public ContainerServiceInner createOrUpdate(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, containerServiceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container 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<ContainerServiceInner> createOrUpdateAsync(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters, final ServiceCallback<ContainerServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, containerServiceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container Service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ContainerServiceInner> createOrUpdateAsync(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, containerServiceName, parameters).map(new Func1<ServiceResponse<ContainerServiceInner>, ContainerServiceInner>() {
+            @Override
+            public ContainerServiceInner call(ServiceResponse<ContainerServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container Service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ContainerServiceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (containerServiceName == null) {
+            throw new IllegalArgumentException("Parameter containerServiceName 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 = "2017-07-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, containerServiceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ContainerServiceInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container Service 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 ContainerServiceInner object if successful.
+     */
+    public ContainerServiceInner beginCreateOrUpdate(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, containerServiceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container 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<ContainerServiceInner> beginCreateOrUpdateAsync(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters, final ServiceCallback<ContainerServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, containerServiceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container Service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ContainerServiceInner object
+     */
+    public Observable<ContainerServiceInner> beginCreateOrUpdateAsync(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, containerServiceName, parameters).map(new Func1<ServiceResponse<ContainerServiceInner>, ContainerServiceInner>() {
+            @Override
+            public ContainerServiceInner call(ServiceResponse<ContainerServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a container service.
+     * Creates or updates a container service with the specified configuration of orchestrator, masters, and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @param parameters Parameters supplied to the Create or Update a Container Service operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ContainerServiceInner object
+     */
+    public Observable<ServiceResponse<ContainerServiceInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String containerServiceName, ContainerServiceInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (containerServiceName == null) {
+            throw new IllegalArgumentException("Parameter containerServiceName 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 = "2017-07-01";
+        return service.beginCreateOrUpdate(resourceGroupName, containerServiceName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ContainerServiceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ContainerServiceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ContainerServiceInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ContainerServiceInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ContainerServiceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ContainerServiceInner>() { }.getType())
+                .register(201, new TypeToken<ContainerServiceInner>() { }.getType())
+                .register(202, new TypeToken<ContainerServiceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the properties of the specified container service.
+     * Gets the properties of the specified container service in the specified subscription and resource group. The operation returns the properties including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and 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 ContainerServiceInner object if successful.
+     */
+    public ContainerServiceInner getByResourceGroup(String resourceGroupName, String containerServiceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, containerServiceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the properties of the specified container service.
+     * Gets the properties of the specified container service in the specified subscription and resource group. The operation returns the properties including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and 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<ContainerServiceInner> getByResourceGroupAsync(String resourceGroupName, String containerServiceName, final ServiceCallback<ContainerServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, containerServiceName), serviceCallback);
+    }
+
+    /**
+     * Gets the properties of the specified container service.
+     * Gets the properties of the specified container service in the specified subscription and resource group. The operation returns the properties including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ContainerServiceInner object
+     */
+    public Observable<ContainerServiceInner> getByResourceGroupAsync(String resourceGroupName, String containerServiceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, containerServiceName).map(new Func1<ServiceResponse<ContainerServiceInner>, ContainerServiceInner>() {
+            @Override
+            public ContainerServiceInner call(ServiceResponse<ContainerServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the properties of the specified container service.
+     * Gets the properties of the specified container service in the specified subscription and resource group. The operation returns the properties including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ContainerServiceInner object
+     */
+    public Observable<ServiceResponse<ContainerServiceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String containerServiceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (containerServiceName == null) {
+            throw new IllegalArgumentException("Parameter containerServiceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2017-07-01";
+        return service.getByResourceGroup(resourceGroupName, containerServiceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ContainerServiceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ContainerServiceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ContainerServiceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ContainerServiceInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ContainerServiceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ContainerServiceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and 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
+     */
+    public void delete(String resourceGroupName, String containerServiceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, containerServiceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and 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<Void> deleteAsync(String resourceGroupName, String containerServiceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, containerServiceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String containerServiceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, containerServiceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String containerServiceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (containerServiceName == null) {
+            throw new IllegalArgumentException("Parameter containerServiceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2017-07-01";
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, containerServiceName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and 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
+     */
+    public void beginDelete(String resourceGroupName, String containerServiceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, containerServiceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and 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<Void> beginDeleteAsync(String resourceGroupName, String containerServiceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, containerServiceName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String containerServiceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, containerServiceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified container service.
+     * Deletes the specified container service in the specified subscription and resource group. The operation does not delete other resources created as part of creating a container service, including storage accounts, VMs, and availability sets. All the other resources created with the container service are part of the same resource group and can be deleted individually.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param containerServiceName The name of the container service in the specified subscription and resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String containerServiceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (containerServiceName == null) {
+            throw new IllegalArgumentException("Parameter containerServiceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2017-07-01";
+        return service.beginDelete(resourceGroupName, containerServiceName, 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @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;ContainerServiceInner&gt; object if successful.
+     */
+    public PagedList<ContainerServiceInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ContainerServiceInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ContainerServiceInner>(response.body()) {
+            @Override
+            public Page<ContainerServiceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @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<ContainerServiceInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ContainerServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<Page<ContainerServiceInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Page<ContainerServiceInner>>() {
+                @Override
+                public Page<ContainerServiceInner> call(ServiceResponse<Page<ContainerServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(ServiceResponse<Page<ContainerServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+    ServiceResponse<PageImpl<ContainerServiceInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ContainerServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> 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 = "2017-07-01";
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ContainerServiceInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ContainerServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ContainerServiceInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ContainerServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ContainerServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the OrchestratorVersionProfileListResultInner object if successful.
+     */
+    public OrchestratorVersionProfileListResultInner listOrchestrators(String location) {
+        return listOrchestratorsWithServiceResponseAsync(location).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<OrchestratorVersionProfileListResultInner> listOrchestratorsAsync(String location, final ServiceCallback<OrchestratorVersionProfileListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listOrchestratorsWithServiceResponseAsync(location), serviceCallback);
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OrchestratorVersionProfileListResultInner object
+     */
+    public Observable<OrchestratorVersionProfileListResultInner> listOrchestratorsAsync(String location) {
+        return listOrchestratorsWithServiceResponseAsync(location).map(new Func1<ServiceResponse<OrchestratorVersionProfileListResultInner>, OrchestratorVersionProfileListResultInner>() {
+            @Override
+            public OrchestratorVersionProfileListResultInner call(ServiceResponse<OrchestratorVersionProfileListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OrchestratorVersionProfileListResultInner object
+     */
+    public Observable<ServiceResponse<OrchestratorVersionProfileListResultInner>> listOrchestratorsWithServiceResponseAsync(String location) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        final String resourceType = null;
+        return service.listOrchestrators(this.client.subscriptionId(), location, apiVersion, resourceType, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<OrchestratorVersionProfileListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OrchestratorVersionProfileListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OrchestratorVersionProfileListResultInner> clientResponse = listOrchestratorsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @param resourceType resource type for which the list of orchestrators needs to be returned
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the OrchestratorVersionProfileListResultInner object if successful.
+     */
+    public OrchestratorVersionProfileListResultInner listOrchestrators(String location, String resourceType) {
+        return listOrchestratorsWithServiceResponseAsync(location, resourceType).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @param resourceType resource type for which the list of orchestrators needs to be returned
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<OrchestratorVersionProfileListResultInner> listOrchestratorsAsync(String location, String resourceType, final ServiceCallback<OrchestratorVersionProfileListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listOrchestratorsWithServiceResponseAsync(location, resourceType), serviceCallback);
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @param resourceType resource type for which the list of orchestrators needs to be returned
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OrchestratorVersionProfileListResultInner object
+     */
+    public Observable<OrchestratorVersionProfileListResultInner> listOrchestratorsAsync(String location, String resourceType) {
+        return listOrchestratorsWithServiceResponseAsync(location, resourceType).map(new Func1<ServiceResponse<OrchestratorVersionProfileListResultInner>, OrchestratorVersionProfileListResultInner>() {
+            @Override
+            public OrchestratorVersionProfileListResultInner call(ServiceResponse<OrchestratorVersionProfileListResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a list of supported orchestrators in the specified subscription.
+     * Gets a list of supported orchestrators in the specified subscription. The operation returns properties of each orchestrator including version, available upgrades and whether that version or upgrades are in preview.
+     *
+     * @param location The name of a supported Azure region.
+     * @param resourceType resource type for which the list of orchestrators needs to be returned
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OrchestratorVersionProfileListResultInner object
+     */
+    public Observable<ServiceResponse<OrchestratorVersionProfileListResultInner>> listOrchestratorsWithServiceResponseAsync(String location, String resourceType) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.listOrchestrators(this.client.subscriptionId(), location, apiVersion, resourceType, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<OrchestratorVersionProfileListResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OrchestratorVersionProfileListResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OrchestratorVersionProfileListResultInner> clientResponse = listOrchestratorsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<OrchestratorVersionProfileListResultInner> listOrchestratorsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<OrchestratorVersionProfileListResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<OrchestratorVersionProfileListResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @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;ContainerServiceInner&gt; object if successful.
+     */
+    public PagedList<ContainerServiceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ContainerServiceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ContainerServiceInner>(response.body()) {
+            @Override
+            public Page<ContainerServiceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @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<ContainerServiceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ContainerServiceInner>> serviceFuture, final ListOperationCallback<ContainerServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<Page<ContainerServiceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Page<ContainerServiceInner>>() {
+                @Override
+                public Page<ContainerServiceInner> call(ServiceResponse<Page<ContainerServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(ServiceResponse<Page<ContainerServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified subscription.
+     * Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+    ServiceResponse<PageImpl<ContainerServiceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ContainerServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> 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<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ContainerServiceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ContainerServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ContainerServiceInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ContainerServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ContainerServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @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;ContainerServiceInner&gt; object if successful.
+     */
+    public PagedList<ContainerServiceInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ContainerServiceInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ContainerServiceInner>(response.body()) {
+            @Override
+            public Page<ContainerServiceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @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<ContainerServiceInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ContainerServiceInner>> serviceFuture, final ListOperationCallback<ContainerServiceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<Page<ContainerServiceInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Page<ContainerServiceInner>>() {
+                @Override
+                public Page<ContainerServiceInner> call(ServiceResponse<Page<ContainerServiceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ContainerServiceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ContainerServiceInner>>, Observable<ServiceResponse<Page<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(ServiceResponse<Page<ContainerServiceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of container services in the specified resource group.
+     * Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.
+     *
+    ServiceResponse<PageImpl<ContainerServiceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ContainerServiceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ContainerServiceInner>>> 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<ContainerServiceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ContainerServiceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ContainerServiceInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ContainerServiceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ContainerServiceInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ContainerServiceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ContainerServiceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsImpl.java
new file mode 100644
index 000000000000..8dc4f008009a
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.CredentialResults;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.CredentialResult;
+
+class CredentialResultsImpl extends WrapperImpl<CredentialResultsInner> implements CredentialResults {
+    private final ContainerServiceManager manager;
+    CredentialResultsImpl(CredentialResultsInner inner, ContainerServiceManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<CredentialResult> kubeconfigs() {
+        return this.inner().kubeconfigs();
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsInner.java
new file mode 100644
index 000000000000..0095a7a8cf0d
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/CredentialResultsInner.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.containerservice.v2019_06_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.CredentialResult;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The list of credential result response.
+ */
+public class CredentialResultsInner {
+    /**
+     * Base64-encoded Kubernetes configuration file.
+     */
+    @JsonProperty(value = "kubeconfigs", access = JsonProperty.Access.WRITE_ONLY)
+    private List<CredentialResult> kubeconfigs;
+
+    /**
+     * Get base64-encoded Kubernetes configuration file.
+     *
+     * @return the kubeconfigs value
+     */
+    public List<CredentialResult> kubeconfigs() {
+        return this.kubeconfigs;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/IdParsingUtils.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/IdParsingUtils.java
new file mode 100644
index 000000000000..acec21a7d39c
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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.containerservice.v2019_06_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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileImpl.java
new file mode 100644
index 000000000000..94d5b115f7fa
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAccessProfile;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.Map;
+
+class ManagedClusterAccessProfileImpl extends WrapperImpl<ManagedClusterAccessProfileInner> implements ManagedClusterAccessProfile {
+    private final ContainerServiceManager manager;
+    ManagedClusterAccessProfileImpl(ManagedClusterAccessProfileInner inner, ContainerServiceManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public byte[] kubeConfig() {
+        return this.inner().kubeConfig();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileInner.java
new file mode 100644
index 000000000000..394e812d421c
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterAccessProfileInner.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.containerservice.v2019_06_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * Managed cluster Access Profile.
+ */
+@JsonFlatten
+public class ManagedClusterAccessProfileInner extends Resource {
+    /**
+     * Base64-encoded Kubernetes configuration file.
+     */
+    @JsonProperty(value = "properties.kubeConfig")
+    private byte[] kubeConfig;
+
+    /**
+     * Get base64-encoded Kubernetes configuration file.
+     *
+     * @return the kubeConfig value
+     */
+    public byte[] kubeConfig() {
+        return this.kubeConfig;
+    }
+
+    /**
+     * Set base64-encoded Kubernetes configuration file.
+     *
+     * @param kubeConfig the kubeConfig value to set
+     * @return the ManagedClusterAccessProfileInner object itself.
+     */
+    public ManagedClusterAccessProfileInner withKubeConfig(byte[] kubeConfig) {
+        this.kubeConfig = kubeConfig;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterImpl.java
new file mode 100644
index 000000000000..e8c41347a194
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedCluster;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAgentPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceLinuxProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterWindowsProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterServicePrincipalProfile;
+import java.util.Map;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAddonProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceNetworkProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAADProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterIdentity;
+
+class ManagedClusterImpl extends GroupableResourceCoreImpl<ManagedCluster, ManagedClusterInner, ManagedClusterImpl, ContainerServiceManager> implements ManagedCluster, ManagedCluster.Definition, ManagedCluster.Update {
+    ManagedClusterImpl(String name, ManagedClusterInner inner, ContainerServiceManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<ManagedCluster> createResourceAsync() {
+        ManagedClustersInner client = this.manager().inner().managedClusters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ManagedCluster> updateResourceAsync() {
+        ManagedClustersInner client = this.manager().inner().managedClusters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ManagedClusterInner> getInnerAsync() {
+        ManagedClustersInner client = this.manager().inner().managedClusters();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public ManagedClusterAADProfile aadProfile() {
+        return this.inner().aadProfile();
+    }
+
+    @Override
+    public Map<String, ManagedClusterAddonProfile> addonProfiles() {
+        return this.inner().addonProfiles();
+    }
+
+    @Override
+    public List<ManagedClusterAgentPoolProfile> agentPoolProfiles() {
+        return this.inner().agentPoolProfiles();
+    }
+
+    @Override
+    public List<String> apiServerAuthorizedIPRanges() {
+        return this.inner().apiServerAuthorizedIPRanges();
+    }
+
+    @Override
+    public String dnsPrefix() {
+        return this.inner().dnsPrefix();
+    }
+
+    @Override
+    public Boolean enablePodSecurityPolicy() {
+        return this.inner().enablePodSecurityPolicy();
+    }
+
+    @Override
+    public Boolean enableRBAC() {
+        return this.inner().enableRBAC();
+    }
+
+    @Override
+    public String fqdn() {
+        return this.inner().fqdn();
+    }
+
+    @Override
+    public ManagedClusterIdentity identity() {
+        return this.inner().identity();
+    }
+
+    @Override
+    public String kubernetesVersion() {
+        return this.inner().kubernetesVersion();
+    }
+
+    @Override
+    public ContainerServiceLinuxProfile linuxProfile() {
+        return this.inner().linuxProfile();
+    }
+
+    @Override
+    public Integer maxAgentPools() {
+        return this.inner().maxAgentPools();
+    }
+
+    @Override
+    public ContainerServiceNetworkProfile networkProfile() {
+        return this.inner().networkProfile();
+    }
+
+    @Override
+    public String nodeResourceGroup() {
+        return this.inner().nodeResourceGroup();
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public ManagedClusterServicePrincipalProfile servicePrincipalProfile() {
+        return this.inner().servicePrincipalProfile();
+    }
+
+    @Override
+    public ManagedClusterWindowsProfile windowsProfile() {
+        return this.inner().windowsProfile();
+    }
+
+    @Override
+    public ManagedClusterImpl withAadProfile(ManagedClusterAADProfile aadProfile) {
+        this.inner().withAadProfile(aadProfile);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withAddonProfiles(Map<String, ManagedClusterAddonProfile> addonProfiles) {
+        this.inner().withAddonProfiles(addonProfiles);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withAgentPoolProfiles(List<ManagedClusterAgentPoolProfile> agentPoolProfiles) {
+        this.inner().withAgentPoolProfiles(agentPoolProfiles);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withApiServerAuthorizedIPRanges(List<String> apiServerAuthorizedIPRanges) {
+        this.inner().withApiServerAuthorizedIPRanges(apiServerAuthorizedIPRanges);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withDnsPrefix(String dnsPrefix) {
+        this.inner().withDnsPrefix(dnsPrefix);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy) {
+        this.inner().withEnablePodSecurityPolicy(enablePodSecurityPolicy);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withEnableRBAC(Boolean enableRBAC) {
+        this.inner().withEnableRBAC(enableRBAC);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withIdentity(ManagedClusterIdentity identity) {
+        this.inner().withIdentity(identity);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withKubernetesVersion(String kubernetesVersion) {
+        this.inner().withKubernetesVersion(kubernetesVersion);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withLinuxProfile(ContainerServiceLinuxProfile linuxProfile) {
+        this.inner().withLinuxProfile(linuxProfile);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withNetworkProfile(ContainerServiceNetworkProfile networkProfile) {
+        this.inner().withNetworkProfile(networkProfile);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withNodeResourceGroup(String nodeResourceGroup) {
+        this.inner().withNodeResourceGroup(nodeResourceGroup);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withServicePrincipalProfile(ManagedClusterServicePrincipalProfile servicePrincipalProfile) {
+        this.inner().withServicePrincipalProfile(servicePrincipalProfile);
+        return this;
+    }
+
+    @Override
+    public ManagedClusterImpl withWindowsProfile(ManagedClusterWindowsProfile windowsProfile) {
+        this.inner().withWindowsProfile(windowsProfile);
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterInner.java
new file mode 100644
index 000000000000..edd924a4e793
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterInner.java
@@ -0,0 +1,441 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAgentPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceLinuxProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterWindowsProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterServicePrincipalProfile;
+import java.util.Map;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAddonProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ContainerServiceNetworkProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAADProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterIdentity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * Managed cluster.
+ */
+@JsonFlatten
+public class ManagedClusterInner extends Resource {
+    /**
+     * The current deployment or provisioning state, which only appears in the
+     * response.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * The max number of agent pools for the managed cluster.
+     */
+    @JsonProperty(value = "properties.maxAgentPools", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer maxAgentPools;
+
+    /**
+     * Version of Kubernetes specified when creating the managed cluster.
+     */
+    @JsonProperty(value = "properties.kubernetesVersion")
+    private String kubernetesVersion;
+
+    /**
+     * DNS prefix specified when creating the managed cluster.
+     */
+    @JsonProperty(value = "properties.dnsPrefix")
+    private String dnsPrefix;
+
+    /**
+     * FQDN for the master pool.
+     */
+    @JsonProperty(value = "properties.fqdn", access = JsonProperty.Access.WRITE_ONLY)
+    private String fqdn;
+
+    /**
+     * Properties of the agent pool.
+     */
+    @JsonProperty(value = "properties.agentPoolProfiles")
+    private List<ManagedClusterAgentPoolProfile> agentPoolProfiles;
+
+    /**
+     * Profile for Linux VMs in the container service cluster.
+     */
+    @JsonProperty(value = "properties.linuxProfile")
+    private ContainerServiceLinuxProfile linuxProfile;
+
+    /**
+     * Profile for Windows VMs in the container service cluster.
+     */
+    @JsonProperty(value = "properties.windowsProfile")
+    private ManagedClusterWindowsProfile windowsProfile;
+
+    /**
+     * Information about a service principal identity for the cluster to use
+     * for manipulating Azure APIs.
+     */
+    @JsonProperty(value = "properties.servicePrincipalProfile")
+    private ManagedClusterServicePrincipalProfile servicePrincipalProfile;
+
+    /**
+     * Profile of managed cluster add-on.
+     */
+    @JsonProperty(value = "properties.addonProfiles")
+    private Map<String, ManagedClusterAddonProfile> addonProfiles;
+
+    /**
+     * Name of the resource group containing agent pool nodes.
+     */
+    @JsonProperty(value = "properties.nodeResourceGroup")
+    private String nodeResourceGroup;
+
+    /**
+     * Whether to enable Kubernetes Role-Based Access Control.
+     */
+    @JsonProperty(value = "properties.enableRBAC")
+    private Boolean enableRBAC;
+
+    /**
+     * (PREVIEW) Whether to enable Kubernetes Pod security policy.
+     */
+    @JsonProperty(value = "properties.enablePodSecurityPolicy")
+    private Boolean enablePodSecurityPolicy;
+
+    /**
+     * Profile of network configuration.
+     */
+    @JsonProperty(value = "properties.networkProfile")
+    private ContainerServiceNetworkProfile networkProfile;
+
+    /**
+     * Profile of Azure Active Directory configuration.
+     */
+    @JsonProperty(value = "properties.aadProfile")
+    private ManagedClusterAADProfile aadProfile;
+
+    /**
+     * (PREVIEW) Authorized IP Ranges to kubernetes API server.
+     */
+    @JsonProperty(value = "properties.apiServerAuthorizedIPRanges")
+    private List<String> apiServerAuthorizedIPRanges;
+
+    /**
+     * The identity of the managed cluster, if configured.
+     */
+    @JsonProperty(value = "identity")
+    private ManagedClusterIdentity identity;
+
+    /**
+     * Get the current deployment or provisioning state, which only appears in the response.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the max number of agent pools for the managed cluster.
+     *
+     * @return the maxAgentPools value
+     */
+    public Integer maxAgentPools() {
+        return this.maxAgentPools;
+    }
+
+    /**
+     * Get version of Kubernetes specified when creating the managed cluster.
+     *
+     * @return the kubernetesVersion value
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set version of Kubernetes specified when creating the managed cluster.
+     *
+     * @param kubernetesVersion the kubernetesVersion value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get dNS prefix specified when creating the managed cluster.
+     *
+     * @return the dnsPrefix value
+     */
+    public String dnsPrefix() {
+        return this.dnsPrefix;
+    }
+
+    /**
+     * Set dNS prefix specified when creating the managed cluster.
+     *
+     * @param dnsPrefix the dnsPrefix value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withDnsPrefix(String dnsPrefix) {
+        this.dnsPrefix = dnsPrefix;
+        return this;
+    }
+
+    /**
+     * Get fQDN for the master pool.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Get properties of the agent pool.
+     *
+     * @return the agentPoolProfiles value
+     */
+    public List<ManagedClusterAgentPoolProfile> agentPoolProfiles() {
+        return this.agentPoolProfiles;
+    }
+
+    /**
+     * Set properties of the agent pool.
+     *
+     * @param agentPoolProfiles the agentPoolProfiles value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withAgentPoolProfiles(List<ManagedClusterAgentPoolProfile> agentPoolProfiles) {
+        this.agentPoolProfiles = agentPoolProfiles;
+        return this;
+    }
+
+    /**
+     * Get profile for Linux VMs in the container service cluster.
+     *
+     * @return the linuxProfile value
+     */
+    public ContainerServiceLinuxProfile linuxProfile() {
+        return this.linuxProfile;
+    }
+
+    /**
+     * Set profile for Linux VMs in the container service cluster.
+     *
+     * @param linuxProfile the linuxProfile value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withLinuxProfile(ContainerServiceLinuxProfile linuxProfile) {
+        this.linuxProfile = linuxProfile;
+        return this;
+    }
+
+    /**
+     * Get profile for Windows VMs in the container service cluster.
+     *
+     * @return the windowsProfile value
+     */
+    public ManagedClusterWindowsProfile windowsProfile() {
+        return this.windowsProfile;
+    }
+
+    /**
+     * Set profile for Windows VMs in the container service cluster.
+     *
+     * @param windowsProfile the windowsProfile value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withWindowsProfile(ManagedClusterWindowsProfile windowsProfile) {
+        this.windowsProfile = windowsProfile;
+        return this;
+    }
+
+    /**
+     * Get information about a service principal identity for the cluster to use for manipulating Azure APIs.
+     *
+     * @return the servicePrincipalProfile value
+     */
+    public ManagedClusterServicePrincipalProfile servicePrincipalProfile() {
+        return this.servicePrincipalProfile;
+    }
+
+    /**
+     * Set information about a service principal identity for the cluster to use for manipulating Azure APIs.
+     *
+     * @param servicePrincipalProfile the servicePrincipalProfile value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withServicePrincipalProfile(ManagedClusterServicePrincipalProfile servicePrincipalProfile) {
+        this.servicePrincipalProfile = servicePrincipalProfile;
+        return this;
+    }
+
+    /**
+     * Get profile of managed cluster add-on.
+     *
+     * @return the addonProfiles value
+     */
+    public Map<String, ManagedClusterAddonProfile> addonProfiles() {
+        return this.addonProfiles;
+    }
+
+    /**
+     * Set profile of managed cluster add-on.
+     *
+     * @param addonProfiles the addonProfiles value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withAddonProfiles(Map<String, ManagedClusterAddonProfile> addonProfiles) {
+        this.addonProfiles = addonProfiles;
+        return this;
+    }
+
+    /**
+     * Get name of the resource group containing agent pool nodes.
+     *
+     * @return the nodeResourceGroup value
+     */
+    public String nodeResourceGroup() {
+        return this.nodeResourceGroup;
+    }
+
+    /**
+     * Set name of the resource group containing agent pool nodes.
+     *
+     * @param nodeResourceGroup the nodeResourceGroup value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withNodeResourceGroup(String nodeResourceGroup) {
+        this.nodeResourceGroup = nodeResourceGroup;
+        return this;
+    }
+
+    /**
+     * Get whether to enable Kubernetes Role-Based Access Control.
+     *
+     * @return the enableRBAC value
+     */
+    public Boolean enableRBAC() {
+        return this.enableRBAC;
+    }
+
+    /**
+     * Set whether to enable Kubernetes Role-Based Access Control.
+     *
+     * @param enableRBAC the enableRBAC value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withEnableRBAC(Boolean enableRBAC) {
+        this.enableRBAC = enableRBAC;
+        return this;
+    }
+
+    /**
+     * Get (PREVIEW) Whether to enable Kubernetes Pod security policy.
+     *
+     * @return the enablePodSecurityPolicy value
+     */
+    public Boolean enablePodSecurityPolicy() {
+        return this.enablePodSecurityPolicy;
+    }
+
+    /**
+     * Set (PREVIEW) Whether to enable Kubernetes Pod security policy.
+     *
+     * @param enablePodSecurityPolicy the enablePodSecurityPolicy value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy) {
+        this.enablePodSecurityPolicy = enablePodSecurityPolicy;
+        return this;
+    }
+
+    /**
+     * Get profile of network configuration.
+     *
+     * @return the networkProfile value
+     */
+    public ContainerServiceNetworkProfile networkProfile() {
+        return this.networkProfile;
+    }
+
+    /**
+     * Set profile of network configuration.
+     *
+     * @param networkProfile the networkProfile value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withNetworkProfile(ContainerServiceNetworkProfile networkProfile) {
+        this.networkProfile = networkProfile;
+        return this;
+    }
+
+    /**
+     * Get profile of Azure Active Directory configuration.
+     *
+     * @return the aadProfile value
+     */
+    public ManagedClusterAADProfile aadProfile() {
+        return this.aadProfile;
+    }
+
+    /**
+     * Set profile of Azure Active Directory configuration.
+     *
+     * @param aadProfile the aadProfile value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withAadProfile(ManagedClusterAADProfile aadProfile) {
+        this.aadProfile = aadProfile;
+        return this;
+    }
+
+    /**
+     * Get (PREVIEW) Authorized IP Ranges to kubernetes API server.
+     *
+     * @return the apiServerAuthorizedIPRanges value
+     */
+    public List<String> apiServerAuthorizedIPRanges() {
+        return this.apiServerAuthorizedIPRanges;
+    }
+
+    /**
+     * Set (PREVIEW) Authorized IP Ranges to kubernetes API server.
+     *
+     * @param apiServerAuthorizedIPRanges the apiServerAuthorizedIPRanges value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withApiServerAuthorizedIPRanges(List<String> apiServerAuthorizedIPRanges) {
+        this.apiServerAuthorizedIPRanges = apiServerAuthorizedIPRanges;
+        return this;
+    }
+
+    /**
+     * Get the identity of the managed cluster, if configured.
+     *
+     * @return the identity value
+     */
+    public ManagedClusterIdentity identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the identity of the managed cluster, if configured.
+     *
+     * @param identity the identity value to set
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withIdentity(ManagedClusterIdentity identity) {
+        this.identity = identity;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileImpl.java
new file mode 100644
index 000000000000..127335f33b27
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterUpgradeProfile;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterPoolUpgradeProfile;
+
+class ManagedClusterUpgradeProfileImpl extends WrapperImpl<ManagedClusterUpgradeProfileInner> implements ManagedClusterUpgradeProfile {
+    private final ContainerServiceManager manager;
+    ManagedClusterUpgradeProfileImpl(ManagedClusterUpgradeProfileInner inner, ContainerServiceManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<ManagedClusterPoolUpgradeProfile> agentPoolProfiles() {
+        return this.inner().agentPoolProfiles();
+    }
+
+    @Override
+    public ManagedClusterPoolUpgradeProfile controlPlaneProfile() {
+        return this.inner().controlPlaneProfile();
+    }
+
+    @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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileInner.java
new file mode 100644
index 000000000000..ad6b4e06c78e
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterUpgradeProfileInner.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterPoolUpgradeProfile;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The list of available upgrades for compute pools.
+ */
+@JsonFlatten
+public class ManagedClusterUpgradeProfileInner {
+    /**
+     * Id of upgrade profile.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Name of upgrade profile.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Type of upgrade profile.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * The list of available upgrade versions for the control plane.
+     */
+    @JsonProperty(value = "properties.controlPlaneProfile", required = true)
+    private ManagedClusterPoolUpgradeProfile controlPlaneProfile;
+
+    /**
+     * The list of available upgrade versions for agent pools.
+     */
+    @JsonProperty(value = "properties.agentPoolProfiles", required = true)
+    private List<ManagedClusterPoolUpgradeProfile> agentPoolProfiles;
+
+    /**
+     * Get id of upgrade profile.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get name of upgrade profile.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get type of upgrade profile.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the list of available upgrade versions for the control plane.
+     *
+     * @return the controlPlaneProfile value
+     */
+    public ManagedClusterPoolUpgradeProfile controlPlaneProfile() {
+        return this.controlPlaneProfile;
+    }
+
+    /**
+     * Set the list of available upgrade versions for the control plane.
+     *
+     * @param controlPlaneProfile the controlPlaneProfile value to set
+     * @return the ManagedClusterUpgradeProfileInner object itself.
+     */
+    public ManagedClusterUpgradeProfileInner withControlPlaneProfile(ManagedClusterPoolUpgradeProfile controlPlaneProfile) {
+        this.controlPlaneProfile = controlPlaneProfile;
+        return this;
+    }
+
+    /**
+     * Get the list of available upgrade versions for agent pools.
+     *
+     * @return the agentPoolProfiles value
+     */
+    public List<ManagedClusterPoolUpgradeProfile> agentPoolProfiles() {
+        return this.agentPoolProfiles;
+    }
+
+    /**
+     * Set the list of available upgrade versions for agent pools.
+     *
+     * @param agentPoolProfiles the agentPoolProfiles value to set
+     * @return the ManagedClusterUpgradeProfileInner object itself.
+     */
+    public ManagedClusterUpgradeProfileInner withAgentPoolProfiles(List<ManagedClusterPoolUpgradeProfile> agentPoolProfiles) {
+        this.agentPoolProfiles = agentPoolProfiles;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersImpl.java
new file mode 100644
index 000000000000..a1fb0d4e371d
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersImpl.java
@@ -0,0 +1,203 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights 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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedCluster;
+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.containerservice.v2019_06_01.CredentialResults;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterServicePrincipalProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAADProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterUpgradeProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterAccessProfile;
+
+class ManagedClustersImpl extends GroupableResourcesCoreImpl<ManagedCluster, ManagedClusterImpl, ManagedClusterInner, ManagedClustersInner, ContainerServiceManager>  implements ManagedClusters {
+    protected ManagedClustersImpl(ContainerServiceManager manager) {
+        super(manager.inner().managedClusters(), manager);
+    }
+
+    @Override
+    protected Observable<ManagedClusterInner> getInnerAsync(String resourceGroupName, String name) {
+        ManagedClustersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ManagedClustersInner 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<ManagedCluster> listByResourceGroup(String resourceGroupName) {
+        ManagedClustersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<ManagedCluster> listByResourceGroupAsync(String resourceGroupName) {
+        ManagedClustersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ManagedClusterInner>, Iterable<ManagedClusterInner>>() {
+            @Override
+            public Iterable<ManagedClusterInner> call(Page<ManagedClusterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedClusterInner, ManagedCluster>() {
+            @Override
+            public ManagedCluster call(ManagedClusterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<ManagedCluster> list() {
+        ManagedClustersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<ManagedCluster> listAsync() {
+        ManagedClustersInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ManagedClusterInner>, Iterable<ManagedClusterInner>>() {
+            @Override
+            public Iterable<ManagedClusterInner> call(Page<ManagedClusterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedClusterInner, ManagedCluster>() {
+            @Override
+            public ManagedCluster call(ManagedClusterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public ManagedClusterImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<CredentialResults> listClusterAdminCredentialsAsync(String resourceGroupName, String resourceName) {
+        ManagedClustersInner client = this.inner();
+        return client.listClusterAdminCredentialsAsync(resourceGroupName, resourceName)
+        .map(new Func1<CredentialResultsInner, CredentialResults>() {
+            @Override
+            public CredentialResults call(CredentialResultsInner inner) {
+                return new CredentialResultsImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<CredentialResults> listClusterUserCredentialsAsync(String resourceGroupName, String resourceName) {
+        ManagedClustersInner client = this.inner();
+        return client.listClusterUserCredentialsAsync(resourceGroupName, resourceName)
+        .map(new Func1<CredentialResultsInner, CredentialResults>() {
+            @Override
+            public CredentialResults call(CredentialResultsInner inner) {
+                return new CredentialResultsImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable resetServicePrincipalProfileAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters) {
+        ManagedClustersInner client = this.inner();
+        return client.resetServicePrincipalProfileAsync(resourceGroupName, resourceName, parameters).toCompletable();
+    }
+
+    @Override
+    public Completable resetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters) {
+        ManagedClustersInner client = this.inner();
+        return client.resetAADProfileAsync(resourceGroupName, resourceName, parameters).toCompletable();
+    }
+
+    @Override
+    protected ManagedClusterImpl wrapModel(ManagedClusterInner inner) {
+        return  new ManagedClusterImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ManagedClusterImpl wrapModel(String name) {
+        return new ManagedClusterImpl(name, new ManagedClusterInner(), this.manager());
+    }
+
+    @Override
+    public Observable<ManagedClusterUpgradeProfile> getUpgradeProfileAsync(String resourceGroupName, String resourceName) {
+        ManagedClustersInner client = this.inner();
+        return client.getUpgradeProfileAsync(resourceGroupName, resourceName)
+        .map(new Func1<ManagedClusterUpgradeProfileInner, ManagedClusterUpgradeProfile>() {
+            @Override
+            public ManagedClusterUpgradeProfile call(ManagedClusterUpgradeProfileInner inner) {
+                return new ManagedClusterUpgradeProfileImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ManagedClusterAccessProfile> getAccessProfileAsync(String resourceGroupName, String resourceName, String roleName) {
+        ManagedClustersInner client = this.inner();
+        return client.getAccessProfileAsync(resourceGroupName, resourceName, roleName)
+        .map(new Func1<ManagedClusterAccessProfileInner, ManagedClusterAccessProfile>() {
+            @Override
+            public ManagedClusterAccessProfile call(ManagedClusterAccessProfileInner inner) {
+                return new ManagedClusterAccessProfileImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersInner.java
new file mode 100644
index 000000000000..94c129bca10e
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClustersInner.java
@@ -0,0 +1,2070 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_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.containerservice.v2019_06_01.ManagedClusterAADProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusterServicePrincipalProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_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;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ManagedClusters.
+ */
+public class ManagedClustersInner implements InnerSupportsGet<ManagedClusterInner>, InnerSupportsDelete<Void>, InnerSupportsListing<ManagedClusterInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ManagedClustersService service;
+    /** The service client containing this operation class. */
+    private ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedClustersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ManagedClustersInner(Retrofit retrofit, ContainerServiceManagementClientImpl client) {
+        this.service = retrofit.create(ManagedClustersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ManagedClusters to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagedClustersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/managedClusters")
+        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.containerservice.v2019_06_01.ManagedClusters listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters")
+        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.containerservice.v2019_06_01.ManagedClusters getUpgradeProfile" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/upgradeProfiles/default")
+        Observable<Response<ResponseBody>> getUpgradeProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters getAccessProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential")
+        Observable<Response<ResponseBody>> getAccessProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("roleName") String roleName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters listClusterAdminCredentials" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/listClusterAdminCredential")
+        Observable<Response<ResponseBody>> listClusterAdminCredentials(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters listClusterUserCredentials" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/listClusterUserCredential")
+        Observable<Response<ResponseBody>> listClusterUserCredentials(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body ManagedClusterInner 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.containerservice.v2019_06_01.ManagedClusters beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body ManagedClusterInner 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.containerservice.v2019_06_01.ManagedClusters updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @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.containerservice.v2019_06_01.ManagedClusters beginUpdateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> beginUpdateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @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.containerservice.v2019_06_01.ManagedClusters delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.ManagedClusters resetServicePrincipalProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetServicePrincipalProfile")
+        Observable<Response<ResponseBody>> resetServicePrincipalProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body ManagedClusterServicePrincipalProfile 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.containerservice.v2019_06_01.ManagedClusters beginResetServicePrincipalProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetServicePrincipalProfile")
+        Observable<Response<ResponseBody>> beginResetServicePrincipalProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body ManagedClusterServicePrincipalProfile 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.containerservice.v2019_06_01.ManagedClusters resetAADProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetAADProfile")
+        Observable<Response<ResponseBody>> resetAADProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body ManagedClusterAADProfile 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.containerservice.v2019_06_01.ManagedClusters beginResetAADProfile" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetAADProfile")
+        Observable<Response<ResponseBody>> beginResetAADProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body ManagedClusterAADProfile 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.containerservice.v2019_06_01.ManagedClusters 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.containerservice.v2019_06_01.ManagedClusters listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<ManagedClusterInner> list() {
+        ServiceResponse<Page<ManagedClusterInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ManagedClusterInner>(response.body()) {
+            @Override
+            public Page<ManagedClusterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<ManagedClusterInner>> listAsync(final ListOperationCallback<ManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<Page<ManagedClusterInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Page<ManagedClusterInner>>() {
+                @Override
+                public Page<ManagedClusterInner> call(ServiceResponse<Page<ManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(ServiceResponse<Page<ManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedClusterInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedClusterInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @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;ManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<ManagedClusterInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ManagedClusterInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ManagedClusterInner>(response.body()) {
+            @Override
+            public Page<ManagedClusterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @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<ManagedClusterInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<Page<ManagedClusterInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Page<ManagedClusterInner>>() {
+                @Override
+                public Page<ManagedClusterInner> call(ServiceResponse<Page<ManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(ServiceResponse<Page<ManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+    ServiceResponse<PageImpl<ManagedClusterInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> 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 = "2019-06-01";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedClusterInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedClusterInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets upgrade profile for a managed cluster.
+     * Gets the details of the upgrade profile for a managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 ManagedClusterUpgradeProfileInner object if successful.
+     */
+    public ManagedClusterUpgradeProfileInner getUpgradeProfile(String resourceGroupName, String resourceName) {
+        return getUpgradeProfileWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets upgrade profile for a managed cluster.
+     * Gets the details of the upgrade profile for a managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<ManagedClusterUpgradeProfileInner> getUpgradeProfileAsync(String resourceGroupName, String resourceName, final ServiceCallback<ManagedClusterUpgradeProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getUpgradeProfileWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Gets upgrade profile for a managed cluster.
+     * Gets the details of the upgrade profile for a managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterUpgradeProfileInner object
+     */
+    public Observable<ManagedClusterUpgradeProfileInner> getUpgradeProfileAsync(String resourceGroupName, String resourceName) {
+        return getUpgradeProfileWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<ManagedClusterUpgradeProfileInner>, ManagedClusterUpgradeProfileInner>() {
+            @Override
+            public ManagedClusterUpgradeProfileInner call(ServiceResponse<ManagedClusterUpgradeProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets upgrade profile for a managed cluster.
+     * Gets the details of the upgrade profile for a managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterUpgradeProfileInner object
+     */
+    public Observable<ServiceResponse<ManagedClusterUpgradeProfileInner>> getUpgradeProfileWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.getUpgradeProfile(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedClusterUpgradeProfileInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedClusterUpgradeProfileInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedClusterUpgradeProfileInner> clientResponse = getUpgradeProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedClusterUpgradeProfileInner> getUpgradeProfileDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedClusterUpgradeProfileInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedClusterUpgradeProfileInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an access profile of a managed cluster.
+     * Gets the accessProfile for the specified role name of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param roleName The name of the role for managed cluster accessProfile 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 ManagedClusterAccessProfileInner object if successful.
+     */
+    public ManagedClusterAccessProfileInner getAccessProfile(String resourceGroupName, String resourceName, String roleName) {
+        return getAccessProfileWithServiceResponseAsync(resourceGroupName, resourceName, roleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an access profile of a managed cluster.
+     * Gets the accessProfile for the specified role name of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param roleName The name of the role for managed cluster accessProfile 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<ManagedClusterAccessProfileInner> getAccessProfileAsync(String resourceGroupName, String resourceName, String roleName, final ServiceCallback<ManagedClusterAccessProfileInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAccessProfileWithServiceResponseAsync(resourceGroupName, resourceName, roleName), serviceCallback);
+    }
+
+    /**
+     * Gets an access profile of a managed cluster.
+     * Gets the accessProfile for the specified role name of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param roleName The name of the role for managed cluster accessProfile resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterAccessProfileInner object
+     */
+    public Observable<ManagedClusterAccessProfileInner> getAccessProfileAsync(String resourceGroupName, String resourceName, String roleName) {
+        return getAccessProfileWithServiceResponseAsync(resourceGroupName, resourceName, roleName).map(new Func1<ServiceResponse<ManagedClusterAccessProfileInner>, ManagedClusterAccessProfileInner>() {
+            @Override
+            public ManagedClusterAccessProfileInner call(ServiceResponse<ManagedClusterAccessProfileInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an access profile of a managed cluster.
+     * Gets the accessProfile for the specified role name of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param roleName The name of the role for managed cluster accessProfile resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterAccessProfileInner object
+     */
+    public Observable<ServiceResponse<ManagedClusterAccessProfileInner>> getAccessProfileWithServiceResponseAsync(String resourceGroupName, String resourceName, String roleName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (roleName == null) {
+            throw new IllegalArgumentException("Parameter roleName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.getAccessProfile(this.client.subscriptionId(), resourceGroupName, resourceName, roleName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedClusterAccessProfileInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedClusterAccessProfileInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedClusterAccessProfileInner> clientResponse = getAccessProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedClusterAccessProfileInner> getAccessProfileDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedClusterAccessProfileInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedClusterAccessProfileInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets cluster admin credential of a managed cluster.
+     * Gets cluster admin credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 CredentialResultsInner object if successful.
+     */
+    public CredentialResultsInner listClusterAdminCredentials(String resourceGroupName, String resourceName) {
+        return listClusterAdminCredentialsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets cluster admin credential of a managed cluster.
+     * Gets cluster admin credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<CredentialResultsInner> listClusterAdminCredentialsAsync(String resourceGroupName, String resourceName, final ServiceCallback<CredentialResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listClusterAdminCredentialsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Gets cluster admin credential of a managed cluster.
+     * Gets cluster admin credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CredentialResultsInner object
+     */
+    public Observable<CredentialResultsInner> listClusterAdminCredentialsAsync(String resourceGroupName, String resourceName) {
+        return listClusterAdminCredentialsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<CredentialResultsInner>, CredentialResultsInner>() {
+            @Override
+            public CredentialResultsInner call(ServiceResponse<CredentialResultsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets cluster admin credential of a managed cluster.
+     * Gets cluster admin credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CredentialResultsInner object
+     */
+    public Observable<ServiceResponse<CredentialResultsInner>> listClusterAdminCredentialsWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.listClusterAdminCredentials(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<CredentialResultsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<CredentialResultsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<CredentialResultsInner> clientResponse = listClusterAdminCredentialsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<CredentialResultsInner> listClusterAdminCredentialsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CredentialResultsInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CredentialResultsInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets cluster user credential of a managed cluster.
+     * Gets cluster user credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 CredentialResultsInner object if successful.
+     */
+    public CredentialResultsInner listClusterUserCredentials(String resourceGroupName, String resourceName) {
+        return listClusterUserCredentialsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets cluster user credential of a managed cluster.
+     * Gets cluster user credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<CredentialResultsInner> listClusterUserCredentialsAsync(String resourceGroupName, String resourceName, final ServiceCallback<CredentialResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listClusterUserCredentialsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Gets cluster user credential of a managed cluster.
+     * Gets cluster user credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CredentialResultsInner object
+     */
+    public Observable<CredentialResultsInner> listClusterUserCredentialsAsync(String resourceGroupName, String resourceName) {
+        return listClusterUserCredentialsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<CredentialResultsInner>, CredentialResultsInner>() {
+            @Override
+            public CredentialResultsInner call(ServiceResponse<CredentialResultsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets cluster user credential of a managed cluster.
+     * Gets cluster user credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CredentialResultsInner object
+     */
+    public Observable<ServiceResponse<CredentialResultsInner>> listClusterUserCredentialsWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.listClusterUserCredentials(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<CredentialResultsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<CredentialResultsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<CredentialResultsInner> clientResponse = listClusterUserCredentialsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<CredentialResultsInner> listClusterUserCredentialsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CredentialResultsInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CredentialResultsInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a managed cluster.
+     * Gets the details of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 ManagedClusterInner object if successful.
+     */
+    public ManagedClusterInner getByResourceGroup(String resourceGroupName, String resourceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a managed cluster.
+     * Gets the details of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<ManagedClusterInner> getByResourceGroupAsync(String resourceGroupName, String resourceName, final ServiceCallback<ManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Gets a managed cluster.
+     * Gets the details of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ManagedClusterInner> getByResourceGroupAsync(String resourceGroupName, String resourceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<ManagedClusterInner>, ManagedClusterInner>() {
+            @Override
+            public ManagedClusterInner call(ServiceResponse<ManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a managed cluster.
+     * Gets the details of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ServiceResponse<ManagedClusterInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedClusterInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedClusterInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedClusterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedClusterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster 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 ManagedClusterInner object if successful.
+     */
+    public ManagedClusterInner createOrUpdate(String resourceGroupName, String resourceName, ManagedClusterInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster 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<ManagedClusterInner> createOrUpdateAsync(String resourceGroupName, String resourceName, ManagedClusterInner parameters, final ServiceCallback<ManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedClusterInner> createOrUpdateAsync(String resourceGroupName, String resourceName, ManagedClusterInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<ManagedClusterInner>, ManagedClusterInner>() {
+            @Override
+            public ManagedClusterInner call(ServiceResponse<ManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedClusterInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String resourceName, ManagedClusterInner 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-06-01";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedClusterInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster 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 ManagedClusterInner object if successful.
+     */
+    public ManagedClusterInner beginCreateOrUpdate(String resourceGroupName, String resourceName, ManagedClusterInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster 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<ManagedClusterInner> beginCreateOrUpdateAsync(String resourceGroupName, String resourceName, ManagedClusterInner parameters, final ServiceCallback<ManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ManagedClusterInner> beginCreateOrUpdateAsync(String resourceGroupName, String resourceName, ManagedClusterInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<ManagedClusterInner>, ManagedClusterInner>() {
+            @Override
+            public ManagedClusterInner call(ServiceResponse<ManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a managed cluster.
+     * Creates or updates a managed cluster with the specified configuration for agents and Kubernetes version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update a Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ServiceResponse<ManagedClusterInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String resourceName, ManagedClusterInner 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-06-01";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedClusterInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedClusterInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedClusterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedClusterInner>() { }.getType())
+                .register(201, new TypeToken<ManagedClusterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 ManagedClusterInner object if successful.
+     */
+    public ManagedClusterInner updateTags(String resourceGroupName, String resourceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().last().body();
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<ManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName, final ServiceCallback<ManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<ManagedClusterInner>, ManagedClusterInner>() {
+            @Override
+            public ManagedClusterInner call(ServiceResponse<ManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedClusterInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        Observable<Response<ResponseBody>> observable = service.updateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedClusterInner>() { }.getType());
+    }
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 ManagedClusterInner object if successful.
+     */
+    public ManagedClusterInner updateTags(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).toBlocking().last().body();
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<ManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags, final ServiceCallback<ManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).map(new Func1<ServiceResponse<ManagedClusterInner>, ManagedClusterInner>() {
+            @Override
+            public ManagedClusterInner call(ServiceResponse<ManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedClusterInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName, 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2019-06-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        Observable<Response<ResponseBody>> observable = service.updateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedClusterInner>() { }.getType());
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 ManagedClusterInner object if successful.
+     */
+    public ManagedClusterInner beginUpdateTags(String resourceGroupName, String resourceName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<ManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName, final ServiceCallback<ManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<ManagedClusterInner>, ManagedClusterInner>() {
+            @Override
+            public ManagedClusterInner call(ServiceResponse<ManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ServiceResponse<ManagedClusterInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.beginUpdateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedClusterInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 ManagedClusterInner object if successful.
+     */
+    public ManagedClusterInner beginUpdateTags(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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<ManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags, final ServiceCallback<ManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).map(new Func1<ServiceResponse<ManagedClusterInner>, ManagedClusterInner>() {
+            @Override
+            public ManagedClusterInner call(ServiceResponse<ManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on a managed cluster.
+     * Updates a managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedClusterInner object
+     */
+    public Observable<ServiceResponse<ManagedClusterInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName, 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2019-06-01";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.beginUpdateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedClusterInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedClusterInner> beginUpdateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedClusterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedClusterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 resourceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 resourceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String resourceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 resourceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster 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 resourceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String resourceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a managed cluster.
+     * Deletes the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-06-01";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, resourceName, 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @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 resetServicePrincipalProfile(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters) {
+        resetServicePrincipalProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> resetServicePrincipalProfileAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(resetServicePrincipalProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> resetServicePrincipalProfileAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters) {
+        return resetServicePrincipalProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> resetServicePrincipalProfileWithServiceResponseAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-06-01";
+        Observable<Response<ResponseBody>> observable = service.resetServicePrincipalProfile(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @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 beginResetServicePrincipalProfile(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters) {
+        beginResetServicePrincipalProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> beginResetServicePrincipalProfileAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetServicePrincipalProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginResetServicePrincipalProfileAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile parameters) {
+        return beginResetServicePrincipalProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Reset Service Principal Profile of a managed cluster.
+     * Update the service principal Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginResetServicePrincipalProfileWithServiceResponseAsync(String resourceGroupName, String resourceName, ManagedClusterServicePrincipalProfile 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-06-01";
+        return service.beginResetServicePrincipalProfile(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, 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 = beginResetServicePrincipalProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginResetServicePrincipalProfileDelegate(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);
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @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 resetAADProfile(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters) {
+        resetAADProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> resetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(resetAADProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> resetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters) {
+        return resetAADProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> resetAADProfileWithServiceResponseAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-06-01";
+        Observable<Response<ResponseBody>> observable = service.resetAADProfile(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @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 beginResetAADProfile(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters) {
+        beginResetAADProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<Void> beginResetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetAADProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginResetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters) {
+        return beginResetAADProfileWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Reset AAD Profile of a managed cluster.
+     * Update the AAD Profile for a managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Reset AAD Profile operation for a Managed Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginResetAADProfileWithServiceResponseAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-06-01";
+        return service.beginResetAADProfile(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, 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 = beginResetAADProfileDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginResetAADProfileDelegate(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 a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @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;ManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<ManagedClusterInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedClusterInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedClusterInner>(response.body()) {
+            @Override
+            public Page<ManagedClusterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @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<ManagedClusterInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedClusterInner>> serviceFuture, final ListOperationCallback<ManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<Page<ManagedClusterInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Page<ManagedClusterInner>>() {
+                @Override
+                public Page<ManagedClusterInner> call(ServiceResponse<Page<ManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(ServiceResponse<Page<ManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed clusters in the specified subscription.
+     * Gets a list of managed clusters in the specified subscription. The operation returns properties of each managed cluster.
+     *
+    ServiceResponse<PageImpl<ManagedClusterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> 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<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedClusterInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedClusterInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @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;ManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<ManagedClusterInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedClusterInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedClusterInner>(response.body()) {
+            @Override
+            public Page<ManagedClusterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @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<ManagedClusterInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedClusterInner>> serviceFuture, final ListOperationCallback<ManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<Page<ManagedClusterInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Page<ManagedClusterInner>>() {
+                @Override
+                public Page<ManagedClusterInner> call(ServiceResponse<Page<ManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedClusterInner>>, Observable<ServiceResponse<Page<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(ServiceResponse<Page<ManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists managed clusters in the specified subscription and resource group.
+     * Lists managed clusters in the specified subscription and resource group. The operation returns properties of each managed cluster.
+     *
+    ServiceResponse<PageImpl<ManagedClusterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedClusterInner>>> 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<ManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedClusterInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedClusterInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterImpl.java
new file mode 100644
index 000000000000..a576689ab1c9
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedCluster;
+import rx.Observable;
+import com.microsoft.azure.management.containerservice.v2019_06_01.PurchasePlan;
+import com.microsoft.azure.management.containerservice.v2019_06_01.NetworkProfile;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftRouterProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusterMasterPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusterAgentPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusterAuthProfile;
+
+class OpenShiftManagedClusterImpl extends GroupableResourceCoreImpl<OpenShiftManagedCluster, OpenShiftManagedClusterInner, OpenShiftManagedClusterImpl, ContainerServiceManager> implements OpenShiftManagedCluster, OpenShiftManagedCluster.Definition, OpenShiftManagedCluster.Update {
+    OpenShiftManagedClusterImpl(String name, OpenShiftManagedClusterInner inner, ContainerServiceManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<OpenShiftManagedCluster> createResourceAsync() {
+        OpenShiftManagedClustersInner client = this.manager().inner().openShiftManagedClusters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<OpenShiftManagedCluster> updateResourceAsync() {
+        OpenShiftManagedClustersInner client = this.manager().inner().openShiftManagedClusters();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<OpenShiftManagedClusterInner> getInnerAsync() {
+        OpenShiftManagedClustersInner client = this.manager().inner().openShiftManagedClusters();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles() {
+        return this.inner().agentPoolProfiles();
+    }
+
+    @Override
+    public OpenShiftManagedClusterAuthProfile authProfile() {
+        return this.inner().authProfile();
+    }
+
+    @Override
+    public String clusterVersion() {
+        return this.inner().clusterVersion();
+    }
+
+    @Override
+    public String fqdn() {
+        return this.inner().fqdn();
+    }
+
+    @Override
+    public OpenShiftManagedClusterMasterPoolProfile masterPoolProfile() {
+        return this.inner().masterPoolProfile();
+    }
+
+    @Override
+    public NetworkProfile networkProfile() {
+        return this.inner().networkProfile();
+    }
+
+    @Override
+    public String openShiftVersion() {
+        return this.inner().openShiftVersion();
+    }
+
+    @Override
+    public PurchasePlan plan() {
+        return this.inner().plan();
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String publicHostname() {
+        return this.inner().publicHostname();
+    }
+
+    @Override
+    public List<OpenShiftRouterProfile> routerProfiles() {
+        return this.inner().routerProfiles();
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl withOpenShiftVersion(String openShiftVersion) {
+        this.inner().withOpenShiftVersion(openShiftVersion);
+        return this;
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl withAgentPoolProfiles(List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles) {
+        this.inner().withAgentPoolProfiles(agentPoolProfiles);
+        return this;
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl withAuthProfile(OpenShiftManagedClusterAuthProfile authProfile) {
+        this.inner().withAuthProfile(authProfile);
+        return this;
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl withMasterPoolProfile(OpenShiftManagedClusterMasterPoolProfile masterPoolProfile) {
+        this.inner().withMasterPoolProfile(masterPoolProfile);
+        return this;
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl withNetworkProfile(NetworkProfile networkProfile) {
+        this.inner().withNetworkProfile(networkProfile);
+        return this;
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl withPlan(PurchasePlan plan) {
+        this.inner().withPlan(plan);
+        return this;
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl withRouterProfiles(List<OpenShiftRouterProfile> routerProfiles) {
+        this.inner().withRouterProfiles(routerProfiles);
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterInner.java
new file mode 100644
index 000000000000..f94723135da0
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClusterInner.java
@@ -0,0 +1,271 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.PurchasePlan;
+import com.microsoft.azure.management.containerservice.v2019_06_01.NetworkProfile;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftRouterProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusterMasterPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusterAgentPoolProfile;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusterAuthProfile;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * OpenShift Managed cluster.
+ */
+@JsonFlatten
+public class OpenShiftManagedClusterInner extends Resource {
+    /**
+     * Define the resource plan as required by ARM for billing purposes.
+     */
+    @JsonProperty(value = "plan")
+    private PurchasePlan plan;
+
+    /**
+     * The current deployment or provisioning state, which only appears in the
+     * response.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * Version of OpenShift specified when creating the cluster.
+     */
+    @JsonProperty(value = "properties.openShiftVersion", required = true)
+    private String openShiftVersion;
+
+    /**
+     * Version of OpenShift specified when creating the cluster.
+     */
+    @JsonProperty(value = "properties.clusterVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String clusterVersion;
+
+    /**
+     * Service generated FQDN for OpenShift API server.
+     */
+    @JsonProperty(value = "properties.publicHostname", access = JsonProperty.Access.WRITE_ONLY)
+    private String publicHostname;
+
+    /**
+     * Service generated FQDN for OpenShift API server loadbalancer internal
+     * hostname.
+     */
+    @JsonProperty(value = "properties.fqdn", access = JsonProperty.Access.WRITE_ONLY)
+    private String fqdn;
+
+    /**
+     * Configuration for OpenShift networking.
+     */
+    @JsonProperty(value = "properties.networkProfile")
+    private NetworkProfile networkProfile;
+
+    /**
+     * Configuration for OpenShift router(s).
+     */
+    @JsonProperty(value = "properties.routerProfiles")
+    private List<OpenShiftRouterProfile> routerProfiles;
+
+    /**
+     * Configuration for OpenShift master VMs.
+     */
+    @JsonProperty(value = "properties.masterPoolProfile")
+    private OpenShiftManagedClusterMasterPoolProfile masterPoolProfile;
+
+    /**
+     * Configuration of OpenShift cluster VMs.
+     */
+    @JsonProperty(value = "properties.agentPoolProfiles")
+    private List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles;
+
+    /**
+     * Configures OpenShift authentication.
+     */
+    @JsonProperty(value = "properties.authProfile")
+    private OpenShiftManagedClusterAuthProfile authProfile;
+
+    /**
+     * Get define the resource plan as required by ARM for billing purposes.
+     *
+     * @return the plan value
+     */
+    public PurchasePlan plan() {
+        return this.plan;
+    }
+
+    /**
+     * Set define the resource plan as required by ARM for billing purposes.
+     *
+     * @param plan the plan value to set
+     * @return the OpenShiftManagedClusterInner object itself.
+     */
+    public OpenShiftManagedClusterInner withPlan(PurchasePlan plan) {
+        this.plan = plan;
+        return this;
+    }
+
+    /**
+     * Get the current deployment or provisioning state, which only appears in the response.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get version of OpenShift specified when creating the cluster.
+     *
+     * @return the openShiftVersion value
+     */
+    public String openShiftVersion() {
+        return this.openShiftVersion;
+    }
+
+    /**
+     * Set version of OpenShift specified when creating the cluster.
+     *
+     * @param openShiftVersion the openShiftVersion value to set
+     * @return the OpenShiftManagedClusterInner object itself.
+     */
+    public OpenShiftManagedClusterInner withOpenShiftVersion(String openShiftVersion) {
+        this.openShiftVersion = openShiftVersion;
+        return this;
+    }
+
+    /**
+     * Get version of OpenShift specified when creating the cluster.
+     *
+     * @return the clusterVersion value
+     */
+    public String clusterVersion() {
+        return this.clusterVersion;
+    }
+
+    /**
+     * Get service generated FQDN for OpenShift API server.
+     *
+     * @return the publicHostname value
+     */
+    public String publicHostname() {
+        return this.publicHostname;
+    }
+
+    /**
+     * Get service generated FQDN for OpenShift API server loadbalancer internal hostname.
+     *
+     * @return the fqdn value
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Get configuration for OpenShift networking.
+     *
+     * @return the networkProfile value
+     */
+    public NetworkProfile networkProfile() {
+        return this.networkProfile;
+    }
+
+    /**
+     * Set configuration for OpenShift networking.
+     *
+     * @param networkProfile the networkProfile value to set
+     * @return the OpenShiftManagedClusterInner object itself.
+     */
+    public OpenShiftManagedClusterInner withNetworkProfile(NetworkProfile networkProfile) {
+        this.networkProfile = networkProfile;
+        return this;
+    }
+
+    /**
+     * Get configuration for OpenShift router(s).
+     *
+     * @return the routerProfiles value
+     */
+    public List<OpenShiftRouterProfile> routerProfiles() {
+        return this.routerProfiles;
+    }
+
+    /**
+     * Set configuration for OpenShift router(s).
+     *
+     * @param routerProfiles the routerProfiles value to set
+     * @return the OpenShiftManagedClusterInner object itself.
+     */
+    public OpenShiftManagedClusterInner withRouterProfiles(List<OpenShiftRouterProfile> routerProfiles) {
+        this.routerProfiles = routerProfiles;
+        return this;
+    }
+
+    /**
+     * Get configuration for OpenShift master VMs.
+     *
+     * @return the masterPoolProfile value
+     */
+    public OpenShiftManagedClusterMasterPoolProfile masterPoolProfile() {
+        return this.masterPoolProfile;
+    }
+
+    /**
+     * Set configuration for OpenShift master VMs.
+     *
+     * @param masterPoolProfile the masterPoolProfile value to set
+     * @return the OpenShiftManagedClusterInner object itself.
+     */
+    public OpenShiftManagedClusterInner withMasterPoolProfile(OpenShiftManagedClusterMasterPoolProfile masterPoolProfile) {
+        this.masterPoolProfile = masterPoolProfile;
+        return this;
+    }
+
+    /**
+     * Get configuration of OpenShift cluster VMs.
+     *
+     * @return the agentPoolProfiles value
+     */
+    public List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles() {
+        return this.agentPoolProfiles;
+    }
+
+    /**
+     * Set configuration of OpenShift cluster VMs.
+     *
+     * @param agentPoolProfiles the agentPoolProfiles value to set
+     * @return the OpenShiftManagedClusterInner object itself.
+     */
+    public OpenShiftManagedClusterInner withAgentPoolProfiles(List<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles) {
+        this.agentPoolProfiles = agentPoolProfiles;
+        return this;
+    }
+
+    /**
+     * Get configures OpenShift authentication.
+     *
+     * @return the authProfile value
+     */
+    public OpenShiftManagedClusterAuthProfile authProfile() {
+        return this.authProfile;
+    }
+
+    /**
+     * Set configures OpenShift authentication.
+     *
+     * @param authProfile the authProfile value to set
+     * @return the OpenShiftManagedClusterInner object itself.
+     */
+    public OpenShiftManagedClusterInner withAuthProfile(OpenShiftManagedClusterAuthProfile authProfile) {
+        this.authProfile = authProfile;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersImpl.java
new file mode 100644
index 000000000000..9135d327b12e
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusters;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedCluster;
+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 OpenShiftManagedClustersImpl extends GroupableResourcesCoreImpl<OpenShiftManagedCluster, OpenShiftManagedClusterImpl, OpenShiftManagedClusterInner, OpenShiftManagedClustersInner, ContainerServiceManager>  implements OpenShiftManagedClusters {
+    protected OpenShiftManagedClustersImpl(ContainerServiceManager manager) {
+        super(manager.inner().openShiftManagedClusters(), manager);
+    }
+
+    @Override
+    protected Observable<OpenShiftManagedClusterInner> getInnerAsync(String resourceGroupName, String name) {
+        OpenShiftManagedClustersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        OpenShiftManagedClustersInner 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<OpenShiftManagedCluster> listByResourceGroup(String resourceGroupName) {
+        OpenShiftManagedClustersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<OpenShiftManagedCluster> listByResourceGroupAsync(String resourceGroupName) {
+        OpenShiftManagedClustersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<OpenShiftManagedClusterInner>, Iterable<OpenShiftManagedClusterInner>>() {
+            @Override
+            public Iterable<OpenShiftManagedClusterInner> call(Page<OpenShiftManagedClusterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<OpenShiftManagedClusterInner, OpenShiftManagedCluster>() {
+            @Override
+            public OpenShiftManagedCluster call(OpenShiftManagedClusterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<OpenShiftManagedCluster> list() {
+        OpenShiftManagedClustersInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<OpenShiftManagedCluster> listAsync() {
+        OpenShiftManagedClustersInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<OpenShiftManagedClusterInner>, Iterable<OpenShiftManagedClusterInner>>() {
+            @Override
+            public Iterable<OpenShiftManagedClusterInner> call(Page<OpenShiftManagedClusterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<OpenShiftManagedClusterInner, OpenShiftManagedCluster>() {
+            @Override
+            public OpenShiftManagedCluster call(OpenShiftManagedClusterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public OpenShiftManagedClusterImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected OpenShiftManagedClusterImpl wrapModel(OpenShiftManagedClusterInner inner) {
+        return  new OpenShiftManagedClusterImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected OpenShiftManagedClusterImpl wrapModel(String name) {
+        return new OpenShiftManagedClusterImpl(name, new OpenShiftManagedClusterInner(), this.manager());
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersInner.java
new file mode 100644
index 000000000000..662089ae98bc
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OpenShiftManagedClustersInner.java
@@ -0,0 +1,1328 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.containerservice.v2019_06_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.containerservice.v2019_06_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 OpenShiftManagedClusters.
+ */
+public class OpenShiftManagedClustersInner implements InnerSupportsGet<OpenShiftManagedClusterInner>, InnerSupportsDelete<Void>, InnerSupportsListing<OpenShiftManagedClusterInner> {
+    /** The Retrofit service to perform REST calls. */
+    private OpenShiftManagedClustersService service;
+    /** The service client containing this operation class. */
+    private ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of OpenShiftManagedClustersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public OpenShiftManagedClustersInner(Retrofit retrofit, ContainerServiceManagementClientImpl client) {
+        this.service = retrofit.create(OpenShiftManagedClustersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for OpenShiftManagedClusters to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface OpenShiftManagedClustersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusters list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/openShiftManagedClusters")
+        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.containerservice.v2019_06_01.OpenShiftManagedClusters listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters")
+        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.containerservice.v2019_06_01.OpenShiftManagedClusters getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusters createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body OpenShiftManagedClusterInner 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.containerservice.v2019_06_01.OpenShiftManagedClusters beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Body OpenShiftManagedClusterInner 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.containerservice.v2019_06_01.OpenShiftManagedClusters updateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> updateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @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.containerservice.v2019_06_01.OpenShiftManagedClusters beginUpdateTags" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}")
+        Observable<Response<ResponseBody>> beginUpdateTags(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @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.containerservice.v2019_06_01.OpenShiftManagedClusters delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusters beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.OpenShiftManagedClusters 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.containerservice.v2019_06_01.OpenShiftManagedClusters listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;OpenShiftManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<OpenShiftManagedClusterInner> list() {
+        ServiceResponse<Page<OpenShiftManagedClusterInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<OpenShiftManagedClusterInner>(response.body()) {
+            @Override
+            public Page<OpenShiftManagedClusterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<OpenShiftManagedClusterInner>> listAsync(final ListOperationCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<Page<OpenShiftManagedClusterInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Page<OpenShiftManagedClusterInner>>() {
+                @Override
+                public Page<OpenShiftManagedClusterInner> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OpenShiftManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2019-04-30";
+        return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OpenShiftManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OpenShiftManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OpenShiftManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @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;OpenShiftManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<OpenShiftManagedClusterInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<OpenShiftManagedClusterInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<OpenShiftManagedClusterInner>(response.body()) {
+            @Override
+            public Page<OpenShiftManagedClusterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @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<OpenShiftManagedClusterInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<Page<OpenShiftManagedClusterInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Page<OpenShiftManagedClusterInner>>() {
+                @Override
+                public Page<OpenShiftManagedClusterInner> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+    ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OpenShiftManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> 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 = "2019-04-30";
+        return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OpenShiftManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OpenShiftManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OpenShiftManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a OpenShift managed cluster.
+     * Gets the details of the managed OpenShift cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 OpenShiftManagedClusterInner object if successful.
+     */
+    public OpenShiftManagedClusterInner getByResourceGroup(String resourceGroupName, String resourceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a OpenShift managed cluster.
+     * Gets the details of the managed OpenShift cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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<OpenShiftManagedClusterInner> getByResourceGroupAsync(String resourceGroupName, String resourceName, final ServiceCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Gets a OpenShift managed cluster.
+     * Gets the details of the managed OpenShift cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<OpenShiftManagedClusterInner> getByResourceGroupAsync(String resourceGroupName, String resourceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<OpenShiftManagedClusterInner>, OpenShiftManagedClusterInner>() {
+            @Override
+            public OpenShiftManagedClusterInner call(ServiceResponse<OpenShiftManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a OpenShift managed cluster.
+     * Gets the details of the managed OpenShift cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<ServiceResponse<OpenShiftManagedClusterInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-04-30";
+        return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<OpenShiftManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OpenShiftManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OpenShiftManagedClusterInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<OpenShiftManagedClusterInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<OpenShiftManagedClusterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<OpenShiftManagedClusterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster 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 OpenShiftManagedClusterInner object if successful.
+     */
+    public OpenShiftManagedClusterInner createOrUpdate(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster 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<OpenShiftManagedClusterInner> createOrUpdateAsync(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner parameters, final ServiceCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<OpenShiftManagedClusterInner> createOrUpdateAsync(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<OpenShiftManagedClusterInner>, OpenShiftManagedClusterInner>() {
+            @Override
+            public OpenShiftManagedClusterInner call(ServiceResponse<OpenShiftManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<OpenShiftManagedClusterInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-04-30";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<OpenShiftManagedClusterInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster 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 OpenShiftManagedClusterInner object if successful.
+     */
+    public OpenShiftManagedClusterInner beginCreateOrUpdate(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster 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<OpenShiftManagedClusterInner> beginCreateOrUpdateAsync(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner parameters, final ServiceCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<OpenShiftManagedClusterInner> beginCreateOrUpdateAsync(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, resourceName, parameters).map(new Func1<ServiceResponse<OpenShiftManagedClusterInner>, OpenShiftManagedClusterInner>() {
+            @Override
+            public OpenShiftManagedClusterInner call(ServiceResponse<OpenShiftManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an OpenShift managed cluster.
+     * Creates or updates a OpenShift managed cluster with the specified configuration for agents and OpenShift version.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<ServiceResponse<OpenShiftManagedClusterInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String resourceName, OpenShiftManagedClusterInner 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName 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 = "2019-04-30";
+        return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<OpenShiftManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OpenShiftManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OpenShiftManagedClusterInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<OpenShiftManagedClusterInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<OpenShiftManagedClusterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<OpenShiftManagedClusterInner>() { }.getType())
+                .register(201, new TypeToken<OpenShiftManagedClusterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 OpenShiftManagedClusterInner object if successful.
+     */
+    public OpenShiftManagedClusterInner updateTags(String resourceGroupName, String resourceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().last().body();
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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<OpenShiftManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName, final ServiceCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<OpenShiftManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<OpenShiftManagedClusterInner>, OpenShiftManagedClusterInner>() {
+            @Override
+            public OpenShiftManagedClusterInner call(ServiceResponse<OpenShiftManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<OpenShiftManagedClusterInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-04-30";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        Observable<Response<ResponseBody>> observable = service.updateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<OpenShiftManagedClusterInner>() { }.getType());
+    }
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 OpenShiftManagedClusterInner object if successful.
+     */
+    public OpenShiftManagedClusterInner updateTags(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).toBlocking().last().body();
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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<OpenShiftManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags, final ServiceCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<OpenShiftManagedClusterInner> updateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return updateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).map(new Func1<ServiceResponse<OpenShiftManagedClusterInner>, OpenShiftManagedClusterInner>() {
+            @Override
+            public OpenShiftManagedClusterInner call(ServiceResponse<OpenShiftManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<OpenShiftManagedClusterInner>> updateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName, 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2019-04-30";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        Observable<Response<ResponseBody>> observable = service.updateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<OpenShiftManagedClusterInner>() { }.getType());
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 OpenShiftManagedClusterInner object if successful.
+     */
+    public OpenShiftManagedClusterInner beginUpdateTags(String resourceGroupName, String resourceName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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<OpenShiftManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName, final ServiceCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<OpenShiftManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<OpenShiftManagedClusterInner>, OpenShiftManagedClusterInner>() {
+            @Override
+            public OpenShiftManagedClusterInner call(ServiceResponse<OpenShiftManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<ServiceResponse<OpenShiftManagedClusterInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-04-30";
+        final Map<String, String> tags = null;
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(null);
+        return service.beginUpdateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<OpenShiftManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OpenShiftManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OpenShiftManagedClusterInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 OpenShiftManagedClusterInner object if successful.
+     */
+    public OpenShiftManagedClusterInner beginUpdateTags(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).toBlocking().single().body();
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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<OpenShiftManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags, final ServiceCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags), serviceCallback);
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<OpenShiftManagedClusterInner> beginUpdateTagsAsync(String resourceGroupName, String resourceName, Map<String, String> tags) {
+        return beginUpdateTagsWithServiceResponseAsync(resourceGroupName, resourceName, tags).map(new Func1<ServiceResponse<OpenShiftManagedClusterInner>, OpenShiftManagedClusterInner>() {
+            @Override
+            public OpenShiftManagedClusterInner call(ServiceResponse<OpenShiftManagedClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates tags on an OpenShift managed cluster.
+     * Updates an OpenShift managed cluster with the specified tags.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @param tags Resource tags.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the OpenShiftManagedClusterInner object
+     */
+    public Observable<ServiceResponse<OpenShiftManagedClusterInner>> beginUpdateTagsWithServiceResponseAsync(String resourceGroupName, String resourceName, 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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        Validator.validate(tags);
+        final String apiVersion = "2019-04-30";
+        TagsObject parameters = new TagsObject();
+        parameters.withTags(tags);
+        return service.beginUpdateTags(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<OpenShiftManagedClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<OpenShiftManagedClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<OpenShiftManagedClusterInner> clientResponse = beginUpdateTagsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<OpenShiftManagedClusterInner> beginUpdateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<OpenShiftManagedClusterInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<OpenShiftManagedClusterInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 resourceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 resourceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String resourceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-04-30";
+        Observable<Response<ResponseBody>> observable = service.delete(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 resourceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster 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 resourceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String resourceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an OpenShift managed cluster.
+     * Deletes the OpenShift managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the OpenShift managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String resourceName) {
+        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 (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        final String apiVersion = "2019-04-30";
+        return service.beginDelete(this.client.subscriptionId(), resourceGroupName, resourceName, 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(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @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;OpenShiftManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<OpenShiftManagedClusterInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<OpenShiftManagedClusterInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OpenShiftManagedClusterInner>(response.body()) {
+            @Override
+            public Page<OpenShiftManagedClusterInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @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<OpenShiftManagedClusterInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<OpenShiftManagedClusterInner>> serviceFuture, final ListOperationCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<Page<OpenShiftManagedClusterInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Page<OpenShiftManagedClusterInner>>() {
+                @Override
+                public Page<OpenShiftManagedClusterInner> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of OpenShift managed clusters in the specified subscription.
+     * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.
+     *
+    ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OpenShiftManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> 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<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OpenShiftManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OpenShiftManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OpenShiftManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @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;OpenShiftManagedClusterInner&gt; object if successful.
+     */
+    public PagedList<OpenShiftManagedClusterInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<OpenShiftManagedClusterInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OpenShiftManagedClusterInner>(response.body()) {
+            @Override
+            public Page<OpenShiftManagedClusterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @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<OpenShiftManagedClusterInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<OpenShiftManagedClusterInner>> serviceFuture, final ListOperationCallback<OpenShiftManagedClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<Page<OpenShiftManagedClusterInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Page<OpenShiftManagedClusterInner>>() {
+                @Override
+                public Page<OpenShiftManagedClusterInner> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OpenShiftManagedClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<OpenShiftManagedClusterInner>>, Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(ServiceResponse<Page<OpenShiftManagedClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists OpenShift managed clusters in the specified subscription and resource group.
+     * Lists OpenShift managed clusters in the specified subscription and resource group. The operation returns properties of each OpenShift managed cluster.
+     *
+    ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OpenShiftManagedClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> 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<OpenShiftManagedClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OpenShiftManagedClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OpenShiftManagedClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OpenShiftManagedClusterInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OpenShiftManagedClusterInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OpenShiftManagedClusterInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueImpl.java
new file mode 100644
index 000000000000..19e123399d6a
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.OperationValue;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class OperationValueImpl extends WrapperImpl<OperationValueInner> implements OperationValue {
+    private final ContainerServiceManager manager;
+    OperationValueImpl(OperationValueInner inner, ContainerServiceManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String description() {
+        return this.inner().description();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String operation() {
+        return this.inner().operation();
+    }
+
+    @Override
+    public String origin() {
+        return this.inner().origin();
+    }
+
+    @Override
+    public String provider() {
+        return this.inner().provider();
+    }
+
+    @Override
+    public String resource() {
+        return this.inner().resource();
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueInner.java
new file mode 100644
index 000000000000..a400407dd2b5
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationValueInner.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.containerservice.v2019_06_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Describes the properties of a Compute Operation value.
+ */
+@JsonFlatten
+public class OperationValueInner {
+    /**
+     * The origin of the compute operation.
+     */
+    @JsonProperty(value = "origin", access = JsonProperty.Access.WRITE_ONLY)
+    private String origin;
+
+    /**
+     * The name of the compute operation.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * The display name of the compute operation.
+     */
+    @JsonProperty(value = "display.operation", access = JsonProperty.Access.WRITE_ONLY)
+    private String operation;
+
+    /**
+     * The display name of the resource the operation applies to.
+     */
+    @JsonProperty(value = "display.resource", access = JsonProperty.Access.WRITE_ONLY)
+    private String resource;
+
+    /**
+     * The description of the operation.
+     */
+    @JsonProperty(value = "display.description", access = JsonProperty.Access.WRITE_ONLY)
+    private String description;
+
+    /**
+     * The resource provider for the operation.
+     */
+    @JsonProperty(value = "display.provider", access = JsonProperty.Access.WRITE_ONLY)
+    private String provider;
+
+    /**
+     * Get the origin of the compute operation.
+     *
+     * @return the origin value
+     */
+    public String origin() {
+        return this.origin;
+    }
+
+    /**
+     * Get the name of the compute operation.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the display name of the compute operation.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Get the display name of the resource the operation applies to.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Get the description of the operation.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Get the resource provider for the operation.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationsImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationsImpl.java
new file mode 100644
index 000000000000..1992ebe2a726
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.containerservice.v2019_06_01.Operations;
+import rx.functions.Func1;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OperationValue;
+
+class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
+    private final ContainerServiceManager manager;
+
+    OperationsImpl(ContainerServiceManager manager) {
+        super(manager.inner().operations());
+        this.manager = manager;
+    }
+
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<OperationValue> listAsync() {
+        OperationsInner client = this.inner();
+        return client.listAsync()
+        .flatMap(new Func1<List<OperationValueInner>, Observable<OperationValueInner>>() {
+            @Override
+            public Observable<OperationValueInner> call(List<OperationValueInner> innerList) {
+                return Observable.from(innerList);
+            }
+        })
+        .map(new Func1<OperationValueInner, OperationValue>() {
+            @Override
+            public OperationValue call(OperationValueInner inner) {
+                return new OperationValueImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationsInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationsInner.java
new file mode 100644
index 000000000000..223a7e72b1c1
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OperationsInner.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.containerservice.v2019_06_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 java.util.List;
+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 ContainerServiceManagementClientImpl 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, ContainerServiceManagementClientImpl 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.containerservice.v2019_06_01.Operations list" })
+        @GET("providers/Microsoft.ContainerService/operations")
+        Observable<Response<ResponseBody>> list(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of compute 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 List&lt;OperationValueInner&gt; object if successful.
+     */
+    public List<OperationValueInner> list() {
+        return listWithServiceResponseAsync().toBlocking().single().body();
+    }
+
+    /**
+     * Gets a list of compute 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<OperationValueInner>> listAsync(final ServiceCallback<List<OperationValueInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(listWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Gets a list of compute operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;OperationValueInner&gt; object
+     */
+    public Observable<List<OperationValueInner>> listAsync() {
+        return listWithServiceResponseAsync().map(new Func1<ServiceResponse<List<OperationValueInner>>, List<OperationValueInner>>() {
+            @Override
+            public List<OperationValueInner> call(ServiceResponse<List<OperationValueInner>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a list of compute operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;OperationValueInner&gt; object
+     */
+    public Observable<ServiceResponse<List<OperationValueInner>>> listWithServiceResponseAsync() {
+        final String apiVersion = "2019-06-01";
+        return service.list(apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<OperationValueInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<OperationValueInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<OperationValueInner>> result = listDelegate(response);
+                        List<OperationValueInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<OperationValueInner>> clientResponse = new ServiceResponse<List<OperationValueInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<OperationValueInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<OperationValueInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<OperationValueInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultImpl.java
new file mode 100644
index 000000000000..bb6956411625
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultImpl.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.containerservice.v2019_06_01.implementation;
+
+import com.microsoft.azure.management.containerservice.v2019_06_01.OrchestratorVersionProfileListResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OrchestratorVersionProfile;
+
+class OrchestratorVersionProfileListResultImpl extends WrapperImpl<OrchestratorVersionProfileListResultInner> implements OrchestratorVersionProfileListResult {
+    private final ContainerServiceManager manager;
+    OrchestratorVersionProfileListResultImpl(OrchestratorVersionProfileListResultInner inner, ContainerServiceManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public ContainerServiceManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<OrchestratorVersionProfile> orchestrators() {
+        return this.inner().orchestrators();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultInner.java
new file mode 100644
index 000000000000..984f4bf10d25
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/OrchestratorVersionProfileListResultInner.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.containerservice.v2019_06_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.containerservice.v2019_06_01.OrchestratorVersionProfile;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The list of versions for supported orchestrators.
+ */
+@JsonFlatten
+public class OrchestratorVersionProfileListResultInner {
+    /**
+     * Id of the orchestrator version profile list result.
+     */
+    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+    private String id;
+
+    /**
+     * Name of the orchestrator version profile list result.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * Type of the orchestrator version profile list result.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * List of orchestrator version profiles.
+     */
+    @JsonProperty(value = "properties.orchestrators", required = true)
+    private List<OrchestratorVersionProfile> orchestrators;
+
+    /**
+     * Get id of the orchestrator version profile list result.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get name of the orchestrator version profile list result.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get type of the orchestrator version profile list result.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get list of orchestrator version profiles.
+     *
+     * @return the orchestrators value
+     */
+    public List<OrchestratorVersionProfile> orchestrators() {
+        return this.orchestrators;
+    }
+
+    /**
+     * Set list of orchestrator version profiles.
+     *
+     * @param orchestrators the orchestrators value to set
+     * @return the OrchestratorVersionProfileListResultInner object itself.
+     */
+    public OrchestratorVersionProfileListResultInner withOrchestrators(List<OrchestratorVersionProfile> orchestrators) {
+        this.orchestrators = orchestrators;
+        return this;
+    }
+
+}
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/PageImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/PageImpl.java
new file mode 100644
index 000000000000..d9af3d41c160
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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.containerservice.v2019_06_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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/PageImpl1.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/PageImpl1.java
new file mode 100644
index 000000000000..7a91c4411183
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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.containerservice.v2019_06_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/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/package-info.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/package-info.java
new file mode 100644
index 000000000000..cdd2d692c3bd
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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 ContainerServiceManagementClient.
+ * Container Service Client.
+ */
+package com.microsoft.azure.management.containerservice.v2019_06_01.implementation;
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/package-info.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/package-info.java
new file mode 100644
index 000000000000..2801c30dbb06
--- /dev/null
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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 ContainerServiceManagementClient.
+ * Container Service Client.
+ */
+package com.microsoft.azure.management.containerservice.v2019_06_01;

From 5c28f7493339146ca6b9c2f9884164c365bff041 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Wed, 14 Aug 2019 13:10:53 -0700
Subject: [PATCH 07/22] Disable Jetty by default. (#4964)

Adds a flag to the pipeline which controls whether it is a track 1 or track 2 build.
---
 .../templates/jobs/archetype-sdk-client.yml   |  1 +
 .../keyvault/test/EcKeyIntegrationTests.java  |  5 ++
 sdk/keyvault/pom.service.xml                  | 62 ++++++++++++-------
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 8d62e550fc7b..c468ebd85216 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -237,6 +237,7 @@ jobs:
 
       - task: Maven@3
         displayName: 'Start Jetty'
+        condition: ne(variables['SdkType'], 'client')
         inputs:
           mavenPomFile: pom.client.xml
           options: '$(DefaultOptions) $(ProfileFlag)'
diff --git a/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java b/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
index f508cfa07f74..b96b62d4a7ec 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
+++ b/sdk/keyvault/microsoft-azure-keyvault-test/src/test/java/com/microsoft/azure/keyvault/test/EcKeyIntegrationTests.java
@@ -23,6 +23,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -110,21 +111,25 @@ public void beforeMethod() throws Exception {
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES256() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p256", P256TestKey()), JsonWebKeySignatureAlgorithm.ES256, "SHA-256");
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES256K() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p256k", P256KTestKey()), JsonWebKeySignatureAlgorithm.ES256K, "SHA-256");
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES384() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p384", P384TestKey()), JsonWebKeySignatureAlgorithm.ES384, "SHA-384");
     }
 
     @Test
+    @Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
     public void testSignVerifyIntegrationES521() throws Exception {
         validateSignVerifyInterop(importTestKey("itwkk-p521", P521TestKey()), JsonWebKeySignatureAlgorithm.ES512, "SHA-512");
     }
diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
index 956a21dfe3d7..d64ee420186b 100644
--- a/sdk/keyvault/pom.service.xml
+++ b/sdk/keyvault/pom.service.xml
@@ -1,30 +1,46 @@
 <!-- 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">
+<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-keyvault-service</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <modules>
-
-    <!-- Track 1 -->
-    <module>microsoft-azure-keyvault</module>
-    <module>microsoft-azure-keyvault-core</module>
-    <module>microsoft-azure-keyvault-webkey</module>
-    <module>microsoft-azure-keyvault-cryptography</module>
-    <module>microsoft-azure-keyvault-extensions</module>
-    <module>microsoft-azure-keyvault-complete</module>
-    
-    <!-- Track 2 -->
-    <module>../core/azure-core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
-    <module>../core/azure-core-test</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
-    <module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
-    <module>azure-keyvault-keys</module>
-    <module>azure-keyvault-secrets</module>
-    
-  </modules>
-
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <profiles>
+    <profile>
+      <id>data</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>microsoft-azure-keyvault</module>
+        <module>microsoft-azure-keyvault-complete</module>
+        <module>microsoft-azure-keyvault-core</module>
+        <module>microsoft-azure-keyvault-cryptography</module>
+        <module>microsoft-azure-keyvault-extensions</module>
+        <module>microsoft-azure-keyvault-test</module>
+        <module>microsoft-azure-keyvault-webkey</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>client</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>!data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>../core/azure-core</module>        <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+        <module>../core/azure-core-test</module>        <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+        <module>../identity/azure-identity</module>        <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
+        <module>azure-keyvault-keys</module>
+        <module>azure-keyvault-secrets</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>

From df4c31066b9235e5f70077ba7f3170d64e4b6acf Mon Sep 17 00:00:00 2001
From: Srikanta <51379715+srnagar@users.noreply.github.com>
Date: Wed, 14 Aug 2019 13:13:24 -0700
Subject: [PATCH 08/22] Update package groups and add description in pom.xml
 for client libraries (#4987)

---
 pom.client.xml                              | 4 ++++
 sdk/identity/azure-identity/pom.xml         | 4 ++++
 sdk/keyvault/azure-keyvault-keys/pom.xml    | 3 ++-
 sdk/keyvault/azure-keyvault-secrets/pom.xml | 3 ++-
 sdk/storage/azure-storage-blob/pom.xml      | 3 ++-
 sdk/storage/azure-storage-common/pom.xml    | 3 ++-
 sdk/storage/azure-storage-file/pom.xml      | 3 ++-
 sdk/storage/azure-storage-queue/pom.xml     | 3 ++-
 8 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pom.client.xml b/pom.client.xml
index ce6957bcaeed..76ca1105732d 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -401,6 +401,10 @@
                 <title>Azure Storage - Queues</title>
                 <packages>com.azure.storage.queue*</packages>
               </group>
+              <group>
+                <title>Azure Telemetry</title>
+                <packages>com.azure.tracing.opentelemetry*</packages>
+              </group>
             </groups>
             <links>
               <link>https://docs.oracle.com/javase/8/docs/api/</link>
diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
index e2be2e9b861f..eb7e8bb04de5 100644
--- a/sdk/identity/azure-identity/pom.xml
+++ b/sdk/identity/azure-identity/pom.xml
@@ -8,6 +8,10 @@
   <artifactId>azure-identity</artifactId>
   <version>1.0.0-preview.3</version>
 
+  <name>Microsoft Azure client library for Identity</name>
+  <description>This module contains client library for Microsoft Azure Identity.</description>
+  <url>https://github.com/Azure/azure-sdk-for-java</url>
+
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
diff --git a/sdk/keyvault/azure-keyvault-keys/pom.xml b/sdk/keyvault/azure-keyvault-keys/pom.xml
index c1819383b7dc..7cf076074879 100644
--- a/sdk/keyvault/azure-keyvault-keys/pom.xml
+++ b/sdk/keyvault/azure-keyvault-keys/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-keyvault-keys</artifactId>
   <version>4.0.0-preview.3</version>
 
-  <name>azure-keyvault-keys</name>
+  <name>Microsoft Azure client library for KeyVault Keys</name>
+  <description>This module contains client library for Microsoft Azure KeyVault Keys.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/keyvault/azure-keyvault-secrets/pom.xml b/sdk/keyvault/azure-keyvault-secrets/pom.xml
index 0c3cf6d4f518..3e9d333cd1b8 100644
--- a/sdk/keyvault/azure-keyvault-secrets/pom.xml
+++ b/sdk/keyvault/azure-keyvault-secrets/pom.xml
@@ -13,7 +13,8 @@
   <artifactId>azure-keyvault-secrets</artifactId>
   <version>4.0.0-preview.3</version>
 
-  <name>azure-keyvault-secrets</name>
+  <name>Microsoft Azure client library for KeyVault Secrets</name>
+  <description>This module contains client library for Microsoft Azure KeyVault Secrets.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index 59e986439e6d..71afc74b13e3 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-blob</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-blob</name>
+  <name>Microsoft Azure client library for Blob Storage</name>
+  <description>This module contains client library for Microsoft Azure Blob Storage.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml
index e50ea1d13cd8..7eb369b5174a 100644
--- a/sdk/storage/azure-storage-common/pom.xml
+++ b/sdk/storage/azure-storage-common/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-common</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-common</name>
+  <name>Microsoft Azure common module for Storage</name>
+  <description>This module contains common code based for all Microsoft Azure Storage client libraries.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/storage/azure-storage-file/pom.xml b/sdk/storage/azure-storage-file/pom.xml
index 91058c7dcdb7..f12383df2f0b 100644
--- a/sdk/storage/azure-storage-file/pom.xml
+++ b/sdk/storage/azure-storage-file/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-file</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-file</name>
+  <name>Microsoft Azure client library for File Storage</name>
+  <description>This module contains client library for Microsoft Azure File Storage.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index 8956e06c351c..f80a5afff324 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -15,7 +15,8 @@
   <artifactId>azure-storage-queue</artifactId>
   <version>12.0.0-preview.3</version>
 
-  <name>azure-storage-queue</name>
+  <name>Microsoft Azure client library for Queue Storage</name>
+  <description>This module contains client library for Microsoft Azure Queue Storage.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <distributionManagement>

From f8085c95fa38c01c2b3718d8e0a4674f4113249b Mon Sep 17 00:00:00 2001
From: Connie Yau <conniey@microsoft.com>
Date: Wed, 14 Aug 2019 13:19:08 -0700
Subject: [PATCH 09/22] Event Hubs: Synchronous APIs Part 2 (#4970)

* Formatting changes in EventHubAsyncProducer.

* Adding EventHubClient, EventHubConsumer, and EventHubProducer.

* Exposing EventHubClient creation in EventHubClientBuilder.

* EventHubClient, Consumer and Producer implements Closeable.

* Fixing sample by removing event hub instance from namespace connection string.

* Remove unneeded sample in EventHubClientBuilder.

* Add EventHubClient to builder annotation.

* Update EventHubClientBuilder samples. Remove unneeded ones.

* Update samples in EventHubClientBuilder.

* Fixing links to EventHubAsyncProducer samples.

* Adding EventHubProducer code samples.

* Update from Iterable to IterableResponse.

* Make test contents package-private.

* Adding tests for EventHubProducer.

* Simplifying creation of EventHubAsyncProducer

* Select correct retryDuration when constructing EventHubProducer.

* Adding EventHubProducer tests.

* Rename EventHubClientIntegrationTest -> EventHubAsyncClientIntegrationTests

* Add integration tests for EventHubClient.

* Make EventHubConsumer methods public
---
 .../eventhubs/EventHubAsyncClient.java        |  22 +-
 .../eventhubs/EventHubAsyncProducer.java      |  10 +-
 .../messaging/eventhubs/EventHubClient.java   | 184 +++++++++++++++
 .../eventhubs/EventHubClientBuilder.java      | 186 +++++++++------
 .../messaging/eventhubs/EventHubConsumer.java |  75 ++++++
 .../messaging/eventhubs/EventHubProducer.java | 198 ++++++++++++++++
 ...EventHubAsyncClientJavaDocCodeSamples.java |  35 +--
 ...entHubAsyncProducerJavaDocCodeSamples.java |   6 +-
 .../EventHubClientJavaDocCodeSamples.java     |  26 +++
 .../EventHubProducerJavaDocCodeSamples.java   | 111 +++++++++
 .../EventHubAsyncClientIntegrationTest.java   | 204 +++++++++++++++++
 .../EventHubAsyncProducerIntegrationTest.java |  25 +-
 .../eventhubs/EventHubAsyncProducerTest.java  |  12 +-
 .../EventHubClientIntegrationTest.java        | 201 ++++------------
 .../EventHubProducerIntegrationTest.java      | 135 +++++++++++
 .../eventhubs/EventHubProducerTest.java       | 215 ++++++++++++++++++
 16 files changed, 1350 insertions(+), 295 deletions(-)
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientJavaDocCodeSamples.java
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncClientIntegrationTest.java
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerIntegrationTest.java
 create mode 100644 sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java

diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
index b071a586319d..a3a6c04861ec 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncClient.java
@@ -49,13 +49,13 @@
  * the Event Hubs namespace and offers operations for sending event data, receiving events, and inspecting the connected
  * Event Hub.
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using an Event Hubs namespace connection string</strong></p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string}
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub instance connection string</strong></p>
+ * <p><strong>Creating an {@link EventHubAsyncClient} using an Event Hub instance connection string</strong></p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string}
  *
  * @see EventHubClientBuilder
  * @see <a href="https://docs.microsoft.com/Azure/event-hubs/event-hubs-about">About Azure Event Hubs</a>
@@ -236,20 +236,22 @@ public EventHubAsyncConsumer createConsumer(String consumerGroup, String partiti
      * @param options The set of options to apply when creating the consumer.
      * @return An new {@link EventHubAsyncConsumer} that receives events from the partition with all configured {@link
      *         EventHubConsumerOptions}.
-     * @throws NullPointerException If {@code eventPosition}, or {@code options} is {@code null}.
-     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is {@code null} or an
-     *         empty string.
+     * @throws NullPointerException If {@code eventPosition}, {@code consumerGroup}, {@code partitionId}, or {@code
+     *     options} is {@code null}.
+     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is an empty string.
      */
     public EventHubAsyncConsumer createConsumer(String consumerGroup, String partitionId, EventPosition eventPosition,
                                                 EventHubConsumerOptions options) {
         Objects.requireNonNull(eventPosition);
         Objects.requireNonNull(options);
+        Objects.requireNonNull(consumerGroup);
+        Objects.requireNonNull(partitionId);
 
         if (ImplUtils.isNullOrEmpty(consumerGroup)) {
-            throw new IllegalArgumentException("'consumerGroup' cannot be null or empty.");
+            throw new IllegalArgumentException("'consumerGroup' cannot be an empty string.");
         }
         if (ImplUtils.isNullOrEmpty(partitionId)) {
-            throw new IllegalArgumentException("'partitionId' cannot be null or empty.");
+            throw new IllegalArgumentException("'partitionId' cannot be an empty string.");
         }
 
         final EventHubConsumerOptions clonedOptions = options.clone();
@@ -268,8 +270,6 @@ public EventHubAsyncConsumer createConsumer(String consumerGroup, String partiti
             return connection.createSession(entityPath).cast(EventHubSession.class);
         }).flatMap(session -> {
             logger.verbose("Creating consumer for path: {}", entityPath);
-
-            logger.verbose("Creating producer for {}", entityPath);
             final RetryPolicy retryPolicy = RetryUtil.getRetryPolicy(clonedOptions.retry());
 
             return session.createConsumer(linkName, entityPath, getExpression(eventPosition),
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java
index e4626ddf7045..ca3eeef4db77 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubAsyncProducer.java
@@ -90,6 +90,7 @@
  * same partition because they all share the same {@link BatchOptions#partitionKey()}.
  * <p>
  * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncproducer.send#eventDataBatch}
+ *
  * @see EventHubAsyncClient#createProducer()
  */
 @Immutable
@@ -166,10 +167,13 @@ public Mono<EventDataBatch> createBatch(BatchOptions options) {
     /**
      * Sends a single event to the associated Event Hub. If the size of the single event exceeds the maximum size
      * allowed, an exception will be triggered and the send will fail.
+
      * <p>
      * For more information regarding the maximum event size allowed, see
      * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
      * Limits</a>.
+     * </p>
+     *
      * @param event Event to send to the service.
      *
      * @return A {@link Mono} that completes when the event is pushed to the service.
@@ -183,11 +187,13 @@ public Mono<Void> send(EventData event) {
     /**
      * Sends a single event to the associated Event Hub with the send options. If the size of the single event exceeds
      * the maximum size allowed, an exception will be triggered and the send will fail.
+     *
      * <p>
      * For more information regarding the maximum event size allowed, see
      * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
      * Limits</a>.
-     * @param event   Event to send to the service.
+     * </p>
+     * @param event Event to send to the service.
      * @param options The set of options to consider when sending this event.
      *
      * @return A {@link Mono} that completes when the event is pushed to the service.
@@ -217,7 +223,7 @@ public Mono<Void> send(Iterable<EventData> events) {
      * Sends a set of events to the associated Event Hub using a batched approach. If the size of events exceed the
      * maximum size of a single batch, an exception will be triggered and the send will fail. By default, the message
      * size is the max amount allowed on the link.
-     * @param events  Events to send to the service.
+     * @param events Events to send to the service.
      * @param options The set of options to consider when sending this batch.
      *
      * @return A {@link Mono} that completes when all events are pushed to the service.
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
new file mode 100644
index 000000000000..031113295187
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClient.java
@@ -0,0 +1,184 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.RetryOptions;
+import com.azure.core.http.rest.IterableResponse;
+import com.azure.core.implementation.annotation.ReturnType;
+import com.azure.core.implementation.annotation.ServiceClient;
+import com.azure.core.implementation.annotation.ServiceMethod;
+import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+
+import java.io.Closeable;
+import java.time.Duration;
+import java.util.Objects;
+
+/**
+ * The main point of interaction with Azure Event Hubs, the client offers a connection to a specific Event Hub within
+ * the Event Hubs namespace and offers operations for sending event data, receiving events, and inspecting the connected
+ * Event Hub.
+ *
+ * <p>
+ * <strong>Creating a synchronous {@link EventHubClient} using an Event Hub instance connection string</strong>
+ * </p>
+ *
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubclient.instantiation}
+ *
+ * @see EventHubClientBuilder
+ * @see EventHubAsyncClient To communicate with Event Hub using an asynchronous client.
+ * @see <a href="https://docs.microsoft.com/Azure/event-hubs/event-hubs-about">About Azure Event Hubs</a>
+ */
+@ServiceClient(builder = EventHubClientBuilder.class)
+public class EventHubClient implements Closeable {
+    private final EventHubAsyncClient client;
+    private final RetryOptions retry;
+    private final EventHubProducerOptions defaultProducerOptions;
+    private final EventHubConsumerOptions defaultConsumerOptions;
+
+    EventHubClient(EventHubAsyncClient client, ConnectionOptions connectionOptions) {
+        Objects.requireNonNull(connectionOptions);
+
+        this.client = Objects.requireNonNull(client);
+        this.retry = connectionOptions.retry();
+        this.defaultProducerOptions = new EventHubProducerOptions()
+            .retry(connectionOptions.retry());
+        this.defaultConsumerOptions = new EventHubConsumerOptions()
+            .retry(connectionOptions.retry())
+            .scheduler(connectionOptions.scheduler());
+    }
+
+    /**
+     * Retrieves information about an Event Hub, including the number of partitions present and their identifiers.
+     *
+     * @return The set of information for the Event Hub that this client is associated with.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public EventHubProperties getProperties() {
+        return client.getProperties().block(retry.tryTimeout());
+    }
+
+    /**
+     * Retrieves the identifiers for all the partitions of an Event Hub.
+     *
+     * @return The identifiers for all partitions of an Event Hub.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public IterableResponse<String> getPartitionIds() {
+        return new IterableResponse<>(client.getPartitionIds());
+    }
+
+    /**
+     * Retrieves information about a specific partition for an Event Hub, including elements that describe the available
+     * events in the partition event stream.
+     *
+     * @param partitionId The unique identifier of a partition associated with the Event Hub.
+     * @return The information for the requested partition under the Event Hub this client is associated with.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public PartitionProperties getPartitionProperties(String partitionId) {
+        return client.getPartitionProperties(partitionId).block(retry.tryTimeout());
+    }
+
+    /**
+     * Creates an Event Hub producer responsible for transmitting {@link EventData} to the Event Hub, grouped together
+     * in batches. Event data is automatically routed to an available partition.
+     *
+     * @return A new {@link EventHubProducer}.
+     */
+    public EventHubProducer createProducer() {
+        return createProducer(defaultProducerOptions);
+    }
+
+    /**
+     * Creates an Event Hub producer responsible for transmitting {@link EventData} to the Event Hub, grouped together
+     * in batches. If {@link EventHubProducerOptions#partitionId() options.partitionId()} is not {@code null}, the
+     * events are routed to that specific partition. Otherwise, events are automatically routed to an available
+     * partition.
+     *
+     * @param options The set of options to apply when creating the producer.
+     * @return A new {@link EventHubProducer}.
+     * @throws NullPointerException if {@code options} is {@code null}.
+     */
+    public EventHubProducer createProducer(EventHubProducerOptions options) {
+        Objects.requireNonNull(options);
+
+        final EventHubAsyncProducer producer = client.createProducer(options);
+
+        final Duration tryTimeout = options.retry() != null && options.retry().tryTimeout() != null
+            ? options.retry().tryTimeout()
+            : defaultProducerOptions.retry().tryTimeout();
+
+        return new EventHubProducer(producer, tryTimeout);
+    }
+
+    /**
+     * Creates an Event Hub consumer responsible for reading {@link EventData} from a specific Event Hub partition, as a
+     * member of the specified consumer group, and begins reading events from the {@code eventPosition}.
+     *
+     * The consumer created is non-exclusive, allowing multiple consumers from the same consumer group to be actively
+     * reading events from the partition. These non-exclusive consumers are sometimes referred to as "Non-epoch
+     * Consumers".
+     *
+     * @param consumerGroup The name of the consumer group this consumer is associated with. Events are read in the
+     *     context of this group. The name of the consumer group that is created by default is {@link
+     *     EventHubAsyncClient#DEFAULT_CONSUMER_GROUP_NAME "$Default"}.
+     * @param partitionId The identifier of the Event Hub partition.
+     * @param eventPosition The position within the partition where the consumer should begin reading events.
+     * @return A new {@link EventHubConsumer} that receives events from the partition at the given position.
+     * @throws NullPointerException If {@code eventPosition}, {@code consumerGroup}, {@code partitionId}, or {@code
+     *     options} is {@code null}.
+     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is an empty string.
+     */
+    public EventHubConsumer createConsumer(String consumerGroup, String partitionId, EventPosition eventPosition) {
+        final EventHubAsyncConsumer consumer = client.createConsumer(consumerGroup, partitionId, eventPosition);
+        return new EventHubConsumer(consumer, defaultConsumerOptions);
+    }
+
+    /**
+     * Creates an Event Hub consumer responsible for reading {@link EventData} from a specific Event Hub partition, as a
+     * member of the configured consumer group, and begins reading events from the specified {@code eventPosition}.
+     *
+     * <p>
+     * A consumer may be exclusive, which asserts ownership over the partition for the consumer group to ensure that
+     * only one consumer from that group is reading from the partition. These exclusive consumers are sometimes referred
+     * to as "Epoch Consumers."
+     *
+     * A consumer may also be non-exclusive, allowing multiple consumers from the same consumer group to be actively
+     * reading events from the partition. These non-exclusive consumers are sometimes referred to as "Non-epoch
+     * Consumers."
+     *
+     * Designating a consumer as exclusive may be specified in the {@code options}, by setting {@link
+     * EventHubConsumerOptions#ownerLevel(Long)} to a non-null value. By default, consumers are created as
+     * non-exclusive.
+     * </p>
+     *
+     * @param consumerGroup The name of the consumer group this consumer is associated with. Events are read in the
+     *     context of this group. The name of the consumer group that is created by default is {@link
+     *     EventHubAsyncClient#DEFAULT_CONSUMER_GROUP_NAME "$Default"}.
+     * @param partitionId The identifier of the Event Hub partition from which events will be received.
+     * @param eventPosition The position within the partition where the consumer should begin reading events.
+     * @param options The set of options to apply when creating the consumer.
+     * @return An new {@link EventHubConsumer} that receives events from the partition with all configured {@link
+     *     EventHubConsumerOptions}.
+     * @throws NullPointerException If {@code eventPosition}, {@code consumerGroup}, {@code partitionId}, or {@code
+     *     options} is {@code null}.
+     * @throws IllegalArgumentException If {@code consumerGroup} or {@code partitionId} is an empty string.
+     */
+    public EventHubConsumer createConsumer(String consumerGroup, String partitionId, EventPosition eventPosition,
+                                           EventHubConsumerOptions options) {
+        final EventHubAsyncConsumer consumer = client.createConsumer(consumerGroup, partitionId, eventPosition, options);
+        return new EventHubConsumer(consumer, options);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void close() {
+        client.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
index 8fd54fc4b773..cdd80c591111 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java
@@ -41,27 +41,27 @@
  * #credential(String, String, TokenCredential)}, is required in order to construct an {@link EventHubAsyncClient}.
  * </p>
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong></p>
- *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string}
- *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub instance connection string</strong></p>
+ * <p>
+ * <strong>Creating an asynchronous {@link EventHubAsyncClient} using Event Hubs namespace connection string</strong>
+ * </p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string}
  *
- * <p><strong>Creating an {@link EventHubAsyncClient} using Event Hub with no retry, different timeout and new
- * Scheduler</strong></p>
+ * <p>
+ * <strong>Creating a synchronous {@link EventHubClient} using an Event Hub instance connection string</strong>
+ * </p>
  *
- * {@codesnippet com.azure.messaging.eventhubs.eventhubasyncclient.retry-timeout-scheduler}
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubclient.instantiation}
  *
- * <p><strong>Creating an {@link EventProcessor} instance using Event Hub instance connection
- *  string</strong></p>
+ * <p>
+ * <strong>Creating an {@link EventProcessor} using Event Hub instance connection string</strong>
+ * </p>
  * {@codesnippet com.azure.messaging.eventhubs.eventprocessor.instantiation}
  *
  * @see EventHubAsyncClient
  * @see EventProcessor
  */
-@ServiceClientBuilder(serviceClients = {EventHubAsyncClient.class, EventProcessor.class})
+@ServiceClientBuilder(serviceClients = {EventHubAsyncClient.class, EventHubClient.class, EventProcessor.class})
 public class EventHubClientBuilder {
 
     private static final String AZURE_EVENT_HUBS_CONNECTION_STRING = "AZURE_EVENT_HUBS_CONNECTION_STRING";
@@ -277,74 +277,44 @@ public EventHubClientBuilder retry(RetryOptions retryOptions) {
      *         specified but the transport type is not {@link TransportType#AMQP_WEB_SOCKETS web sockets}.
      */
     public EventHubAsyncClient buildAsyncClient() {
-        configuration = configuration == null ? ConfigurationManager.getConfiguration().clone() : configuration;
-
-        if (credentials == null) {
-            final String connectionString = configuration.get(AZURE_EVENT_HUBS_CONNECTION_STRING);
-
-            if (ImplUtils.isNullOrEmpty(connectionString)) {
-                throw new IllegalArgumentException("Credentials have not been set using 'EventHubClientBuilder.credentials(String)'"
-                    + "EventHubClientBuilder.credentials(String, String, TokenCredential). And the connection string is"
-                    + "not set in the '" + AZURE_EVENT_HUBS_CONNECTION_STRING + "' environment variable.");
-            }
-
-            connectionString(connectionString);
-        }
-
-        if (retryOptions == null) {
-            retryOptions = DEFAULT_RETRY;
-        }
-
-        // If the proxy has been configured by the user but they have overridden the TransportType with something that
-        // is not AMQP_WEB_SOCKETS.
-        if (proxyConfiguration != null && proxyConfiguration.isProxyAddressConfigured()
-            && transport != TransportType.AMQP_WEB_SOCKETS) {
-            throw new IllegalArgumentException("Cannot use a proxy when TransportType is not AMQP.");
-        }
-
-        if (proxyConfiguration == null) {
-            proxyConfiguration = getDefaultProxyConfiguration(configuration);
-        }
-
-        if (scheduler == null) {
-            scheduler = Schedulers.elastic();
-        }
-
+        final ConnectionOptions connectionOptions = getConnectionOptions();
         final ReactorProvider provider = new ReactorProvider();
         final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(provider);
-        final CBSAuthorizationType authorizationType = credentials instanceof EventHubSharedAccessKeyCredential
-            ? CBSAuthorizationType.SHARED_ACCESS_SIGNATURE
-            : CBSAuthorizationType.JSON_WEB_TOKEN;
-        final ConnectionOptions parameters = new ConnectionOptions(host, eventHubName, credentials, authorizationType,
-            transport, retryOptions, proxyConfiguration, scheduler);
 
-        return new EventHubAsyncClient(parameters, provider, handlerProvider);
+        return new EventHubAsyncClient(connectionOptions, provider, handlerProvider);
     }
 
-    private ProxyConfiguration getDefaultProxyConfiguration(Configuration configuration) {
-        ProxyAuthenticationType authentication = ProxyAuthenticationType.NONE;
-        if (proxyConfiguration != null) {
-            authentication = proxyConfiguration.authentication();
-        }
-
-        String proxyAddress = configuration.get(BaseConfigurations.HTTP_PROXY);
-
-        if (ImplUtils.isNullOrEmpty(proxyAddress)) {
-            return ProxyConfiguration.SYSTEM_DEFAULTS;
-        }
-
-        final String[] hostPort = proxyAddress.split(":");
-        if (hostPort.length < 2) {
-            throw new IllegalArgumentException("HTTP_PROXY cannot be parsed into a proxy");
-        }
-
-        final String host = hostPort[0];
-        final int port = Integer.parseInt(hostPort[1]);
-        final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
-        final String username = configuration.get(ProxyConfiguration.PROXY_USERNAME);
-        final String password = configuration.get(ProxyConfiguration.PROXY_PASSWORD);
+    /**
+     * Creates a new {@link EventHubClient} based on options set on this builder. Every time {@code buildClient()}
+     * is invoked, a new instance of {@link EventHubClient} is created.
+     *
+     * <p>
+     * The following options are used if ones are not specified in the builder:
+     *
+     * <ul>
+     * <li>If no configuration is specified, the {@link ConfigurationManager#getConfiguration() global configuration}
+     * is used to provide any shared configuration values. The configuration values read are the {@link
+     * BaseConfigurations#HTTP_PROXY}, {@link ProxyConfiguration#PROXY_USERNAME}, and {@link
+     * ProxyConfiguration#PROXY_PASSWORD}.</li>
+     * <li>If no retry is specified, the default retry options are used.</li>
+     * <li>If no proxy is specified, the builder checks the {@link ConfigurationManager#getConfiguration() global
+     * configuration} for a configured proxy, then it checks to see if a system proxy is configured.</li>
+     * <li>If no timeout is specified, a {@link ClientConstants#OPERATION_TIMEOUT timeout of one minute} is used.</li>
+     * <li>If no scheduler is specified, an {@link Schedulers#elastic() elastic scheduler} is used.</li>
+     * </ul>
+     *
+     * @return A new {@link EventHubClient} instance with all the configured options.
+     * @throws IllegalArgumentException if the credentials have not been set using either {@link
+     *         #connectionString(String)} or {@link #credential(String, String, TokenCredential)}. Or, if a proxy is
+     *         specified but the transport type is not {@link TransportType#AMQP_WEB_SOCKETS web sockets}.
+     */
+    public EventHubClient buildClient() {
+        final ConnectionOptions connectionOptions = getConnectionOptions();
+        final ReactorProvider provider = new ReactorProvider();
+        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(provider);
+        final EventHubAsyncClient client = new EventHubAsyncClient(connectionOptions, provider, handlerProvider);
 
-        return new ProxyConfiguration(authentication, proxy, username, password);
+        return new EventHubClient(client, connectionOptions);
     }
 
     /**
@@ -429,4 +399,72 @@ public EventProcessor buildEventProcessor() {
         return new EventProcessor(buildAsyncClient(), this.consumerGroupName,
             this.partitionProcessorFactory, initialEventPosition, partitionManager, eventHubName);
     }
+
+    private ConnectionOptions getConnectionOptions() {
+        configuration = configuration == null ? ConfigurationManager.getConfiguration().clone() : configuration;
+
+        if (credentials == null) {
+            final String connectionString = configuration.get(AZURE_EVENT_HUBS_CONNECTION_STRING);
+
+            if (ImplUtils.isNullOrEmpty(connectionString)) {
+                throw new IllegalArgumentException("Credentials have not been set using 'EventHubClientBuilder.credentials(String)'"
+                    + "EventHubClientBuilder.credentials(String, String, TokenCredential). And the connection string is"
+                    + "not set in the '" + AZURE_EVENT_HUBS_CONNECTION_STRING + "' environment variable.");
+            }
+
+            connectionString(connectionString);
+        }
+
+        if (retryOptions == null) {
+            retryOptions = DEFAULT_RETRY;
+        }
+
+        // If the proxy has been configured by the user but they have overridden the TransportType with something that
+        // is not AMQP_WEB_SOCKETS.
+        if (proxyConfiguration != null && proxyConfiguration.isProxyAddressConfigured()
+            && transport != TransportType.AMQP_WEB_SOCKETS) {
+            throw new IllegalArgumentException("Cannot use a proxy when TransportType is not AMQP.");
+        }
+
+        if (proxyConfiguration == null) {
+            proxyConfiguration = getDefaultProxyConfiguration(configuration);
+        }
+
+        if (scheduler == null) {
+            scheduler = Schedulers.elastic();
+        }
+
+        final CBSAuthorizationType authorizationType = credentials instanceof EventHubSharedAccessKeyCredential
+            ? CBSAuthorizationType.SHARED_ACCESS_SIGNATURE
+            : CBSAuthorizationType.JSON_WEB_TOKEN;
+
+        return new ConnectionOptions(host, eventHubName, credentials, authorizationType,
+            transport, retryOptions, proxyConfiguration, scheduler);
+    }
+
+    private ProxyConfiguration getDefaultProxyConfiguration(Configuration configuration) {
+        ProxyAuthenticationType authentication = ProxyAuthenticationType.NONE;
+        if (proxyConfiguration != null) {
+            authentication = proxyConfiguration.authentication();
+        }
+
+        String proxyAddress = configuration.get(BaseConfigurations.HTTP_PROXY);
+
+        if (ImplUtils.isNullOrEmpty(proxyAddress)) {
+            return ProxyConfiguration.SYSTEM_DEFAULTS;
+        }
+
+        final String[] hostPort = proxyAddress.split(":");
+        if (hostPort.length < 2) {
+            throw new IllegalArgumentException("HTTP_PROXY cannot be parsed into a proxy");
+        }
+
+        final String host = hostPort[0];
+        final int port = Integer.parseInt(hostPort[1]);
+        final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
+        final String username = configuration.get(ProxyConfiguration.PROXY_USERNAME);
+        final String password = configuration.get(ProxyConfiguration.PROXY_PASSWORD);
+
+        return new ProxyConfiguration(authentication, proxy, username, password);
+    }
 }
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
new file mode 100644
index 000000000000..7650df110601
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubConsumer.java
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.http.rest.IterableResponse;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import reactor.core.publisher.Flux;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Objects;
+
+/**
+ * A consumer responsible for reading {@link EventData} from a specific Event Hub partition in the context of a specific
+ * consumer group.
+ *
+ * <ul>
+ * <li>If {@link EventHubConsumer} is created where {@link EventHubConsumerOptions#ownerLevel()} has a
+ * value, then Event Hubs service will guarantee only one active consumer exists per partitionId and consumer group
+ * combination. This consumer is sometimes referred to as an "Epoch Consumer."</li>
+ * <li>Multiple consumers per partitionId and consumer group combination can be created by not setting
+ * {@link EventHubConsumerOptions#ownerLevel()} when creating consumers. This non-exclusive consumer is sometimes
+ * referred to as a "Non-Epoch Consumer."</li>
+ * </ul>
+ *
+ * @see EventHubClient#createConsumer(String, String, EventPosition)
+ * @see EventHubClient#createConsumer(String, String, EventPosition, EventHubConsumerOptions)
+ */
+public class EventHubConsumer implements Closeable {
+    private final EventHubAsyncConsumer consumer;
+    private final EventHubConsumerOptions options;
+
+    EventHubConsumer(EventHubAsyncConsumer consumer, EventHubConsumerOptions options) {
+        this.consumer = Objects.requireNonNull(consumer);
+        this.options = Objects.requireNonNull(options);
+
+        //TODO (conniey): Keep track of the last sequence number as each method invoked.
+        this.consumer.receive().windowTimeout(options.prefetchCount(), this.options.retry().tryTimeout());
+    }
+
+    /**
+     * Receives a batch of EventData from the Event Hub partition.
+     *
+     * @param maximumMessageCount The maximum number of messages to receive in this batch.
+     * @return A set of {@link EventData} that was received. The iterable contains up to {@code maximumMessageCount}
+     *     events.
+     */
+    public IterableResponse<EventData> receive(int maximumMessageCount) {
+        return new IterableResponse<>(Flux.empty());
+    }
+
+    /**
+     * Receives a batch of EventData from the Event Hub partition
+     *
+     * @param maximumMessageCount The maximum number of messages to receive in this batch.
+     * @param maximumWaitTime The maximum amount of time to wait to build up the requested message count for the
+     *     batch; if not specified, the default wait time specified when the consumer was created will be used.
+     * @return A set of {@link EventData} that was received. The iterable contains up to {@code maximumMessageCount}
+     *     events.
+     */
+    public IterableResponse<EventData> receive(int maximumMessageCount, Duration maximumWaitTime) {
+        return new IterableResponse<>(Flux.empty());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void close() throws IOException {
+        consumer.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
new file mode 100644
index 000000000000..d71484492a9f
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubProducer.java
@@ -0,0 +1,198 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.implementation.annotation.Immutable;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Objects;
+
+/**
+ * A producer responsible for transmitting {@link EventData} to a specific Event Hub, grouped together in batches.
+ * Depending on the options specified at creation, the producer may be created to allow event data to be automatically
+ * routed to an available partition or specific to a partition.
+ *
+ * <p>
+ * Allowing automatic routing of partitions is recommended when:
+ * <ul>
+ * <li>The sending of events needs to be highly available.</li>
+ * <li>The event data should be evenly distributed among all available partitions.</li>
+ * </ul>
+ * </p>
+ *
+ * <p>
+ * If no partition is specified, the following rules are used for automatically selecting one:
+ * <ol>
+ * <li>Distribute the events equally amongst all available partitions using a round-robin approach.</li>
+ * <li>If a partition becomes unavailable, the Event Hubs service will automatically detect it and forward the
+ * message to another available partition.</li>
+ * </ol>
+ * </p>
+ *
+ * <p><strong>Create a producer that routes events to any partition</strong></p>
+ * To allow automatic routing of messages to available partition, do not specify the {@link
+ * EventHubProducerOptions#partitionId() partitionId} when creating the {@link EventHubProducer}.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.instantiation}
+ *
+ * <p><strong>Create a producer that publishes events to partition "foo" with a timeout of 45 seconds.</strong></p>
+ * <p>
+ * Developers can push events to a single partition by specifying the {@link EventHubProducerOptions#partitionId(String)
+ * partitionId} when creating an {@link EventHubProducer}.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.instantiation#partitionId}
+ *
+ * <p><strong>Publish events to the same partition, grouped together using {@link SendOptions#partitionKey(String)}.</strong></p>
+ * <p>
+ * If developers want to push similar events to end up at the same partition, but do not require them to go to a
+ * specific partition, they can use {@link SendOptions#partitionKey(String)}.
+ * <p>
+ * In the sample below, all the "sandwiches" end up in the same partition, but it could end up in partition 0, 1, etc.
+ * of the available partitions. All that matters to the end user is that they are grouped together.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.send#publisher-sendOptions}
+ *
+ * <p><strong>Publish events using an {@link EventDataBatch}.</strong></p>
+ * <p>
+ * Developers can create an {@link EventDataBatch}, add the events they want into it, and publish these events together.
+ * When creating a {@link EventDataBatch batch}, developers can specify a set of {@link BatchOptions options} to
+ * configure this batch.
+ * <p>
+ * In the scenario below, the developer is creating a networked video game. They want to receive telemetry about their
+ * users' gaming systems, but do not want to slow down the network with telemetry. So they limit the size of their
+ * {@link EventDataBatch batches} to be no larger than 256 bytes. The events within the batch also get hashed to the
+ * same partition because they all share the same {@link BatchOptions#partitionKey()}.
+ * <p>
+ * {@codesnippet com.azure.messaging.eventhubs.eventhubproducer.send#eventDataBatch}
+ *
+ * @see EventHubClient#createProducer()
+ * @see EventHubAsyncProducer To asynchronously generate events to an Event Hub, see EventHubAsyncProducer.
+ */
+@Immutable
+public class EventHubProducer implements Closeable {
+    private final EventHubAsyncProducer producer;
+    private final Duration tryTimeout;
+
+    /**
+     * Creates a new instance of {@link EventHubProducer} that sends messages to an Azure Event Hub.
+     *
+     * @throws NullPointerException if {@code producer} or {@code tryTimeout} is null.
+     */
+    EventHubProducer(EventHubAsyncProducer producer, Duration tryTimeout) {
+        this.producer = Objects.requireNonNull(producer);
+        this.tryTimeout = Objects.requireNonNull(tryTimeout);
+    }
+
+    /**
+     * Creates an {@link EventDataBatch} that can fit as many events as the transport allows.
+     *
+     * @return A new {@link EventDataBatch} that can fit as many events as the transport allows.
+     */
+    public EventDataBatch createBatch() {
+        return producer.createBatch().block(tryTimeout);
+    }
+
+    /**
+     * Creates an {@link EventDataBatch} that can fit as many events as the transport allows.
+     *
+     * @param options A set of options used to configure the {@link EventDataBatch}.
+     * @return A new {@link EventDataBatch} that can fit as many events as the transport allows.
+     */
+    public EventDataBatch createBatch(BatchOptions options) {
+        return producer.createBatch(options).block(tryTimeout);
+    }
+
+    /**
+     * Sends a single event to the associated Event Hub. If the size of the single event exceeds the maximum size
+     * allowed, an exception will be triggered and the send will fail.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param event Event to send to the service.
+     */
+    public void send(EventData event) {
+        producer.send(event).block();
+    }
+
+    /**
+     * Sends a single event to the associated Event Hub with the send options. If the size of the single event exceeds
+     * the maximum size allowed, an exception will be triggered and the send will fail.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param event Event to send to the service.
+     * @param options The set of options to consider when sending this event.
+     */
+    public void send(EventData event, SendOptions options) {
+        producer.send(event, options).block();
+    }
+
+    /**
+     * Sends a set of events to the associated Event Hub using a batched approach. If the size of events exceed the
+     * maximum size of a single batch, an exception will be triggered and the send will fail. By default, the message
+     * size is the max amount allowed on the link.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param events Events to send to the service.
+     */
+    public void send(Iterable<EventData> events) {
+        producer.send(events).block();
+    }
+
+    /**
+     * Sends a set of events to the associated Event Hub using a batched approach. If the size of events exceed the
+     * maximum size of a single batch, an exception will be triggered and the send will fail. By default, the message
+     * size is the max amount allowed on the link.
+     *
+     * <p>
+     * For more information regarding the maximum event size allowed, see
+     * <a href="https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-quotas">Azure Event Hubs Quotas and
+     * Limits</a>.
+     * </p>
+     *
+     * @param events Events to send to the service.
+     * @param options The set of options to consider when sending this batch.
+     */
+    public void send(Iterable<EventData> events, SendOptions options) {
+        producer.send(events, options).block();
+    }
+
+    /**
+     * Sends the batch to the associated Event Hub.
+     *
+     * @param batch The batch to send to the service.
+     * @throws NullPointerException if {@code batch} is {@code null}.
+     * @see EventHubProducer#createBatch()
+     * @see EventHubProducer#createBatch(BatchOptions)
+     */
+    public void send(EventDataBatch batch) {
+        producer.send(batch).block();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void close() throws IOException {
+        producer.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java
index 99b1b75dfa20..796a0738b6c7 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncClientJavaDocCodeSamples.java
@@ -3,11 +3,6 @@
 
 package com.azure.messaging.eventhubs;
 
-import com.azure.core.amqp.RetryOptions;
-import reactor.core.scheduler.Schedulers;
-
-import java.time.Duration;
-
 /**
  * Contains code snippets when generating javadocs through doclets for {@link EventHubAsyncClient}.
  */
@@ -17,15 +12,15 @@ public class EventHubAsyncClientJavaDocCodeSamples {
      * Creating an {@link EventHubAsyncClient} using an Event Hubs namespace connection string with an Event Hub name.
      */
     public void instantiation() {
-        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string
+        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
-            + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
+            + "SharedAccessKey={sharedAccessKey}";
         String eventHubName = "my-event-hub";
 
         EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString, eventHubName)
             .buildAsyncClient();
-        // END: com.azure.messaging.eventhubs.eventhubasyncclient.connectionString#string-string
+        // END: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string-string
 
         client.close();
     }
@@ -34,34 +29,14 @@ public void instantiation() {
      * Creating an {@link EventHubAsyncClient} using a connection string specific to an Event Hub instance.
      */
     public void instantiationInstance() {
-        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string
-        String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
-            + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
-
-        EventHubAsyncClient client = new EventHubClientBuilder()
-            .connectionString(connectionString)
-            .buildAsyncClient();
-        // END: com.azure.messaging.eventhubs.eventhubasyncclient.connectionstring#string
-
-        client.close();
-    }
-
-    /**
-     * Demonstrates an {@link EventHubClientBuilder} using retry, timeout and a different scheduler.
-     */
-    public void instantiationRetry() {
-        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.retry-timeout-scheduler
+        // BEGIN: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string
         String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
             + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
 
-        RetryOptions retryOptions = new RetryOptions()
-            .tryTimeout(Duration.ofSeconds(30));
         EventHubAsyncClient client = new EventHubClientBuilder()
             .connectionString(connectionString)
-            .retry(retryOptions)
-            .scheduler(Schedulers.newElastic("dedicated-event-hub-scheduler"))
             .buildAsyncClient();
-        // END: com.azure.messaging.eventhubs.eventhubasyncclient.retry-timeout-scheduler
+        // END: com.azure.messaging.eventhubs.eventhubasyncclient.instantiation#string
 
         client.close();
     }
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java
index 1c00ee7e23e5..f176ebb2825e 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubAsyncProducerJavaDocCodeSamples.java
@@ -22,7 +22,8 @@ public class EventHubAsyncProducerJavaDocCodeSamples {
     private final EventHubAsyncClient client = new EventHubClientBuilder().connectionString("fake-string").buildAsyncClient();
 
     /**
-     * Code snippet demonstrating how to create an EventHubProducer that automatically routes events to any partition.
+     * Code snippet demonstrating how to create an {@link EventHubAsyncProducer} that automatically routes events to any
+     * partition.
      *
      * @throws IOException if the producer cannot be disposed.
      */
@@ -39,7 +40,8 @@ public void instantiate() throws IOException {
     }
 
     /**
-     * Code snippet demonstrating how to create an EventHubProducer that routes events to a single partition.
+     * Code snippet demonstrating how to create an {@link EventHubAsyncProducer}  that routes events to a single
+     * partition.
      *
      * @throws IOException if the producer cannot be disposed.
      */
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientJavaDocCodeSamples.java
new file mode 100644
index 000000000000..c4f947fd78c4
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubClientJavaDocCodeSamples.java
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+/**
+ * Contains code snippets when generating javadocs through doclets for {@link EventHubClient}.
+ */
+public class EventHubClientJavaDocCodeSamples {
+    /**
+     * Creating an {@link EventHubClient} using a connection string specific to an Event Hub instance with different
+     * retry options.
+     */
+    public void instantiation() {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubclient.instantiation
+        String connectionString = "Endpoint={endpoint};SharedAccessKeyName={sharedAccessKeyName};"
+            + "SharedAccessKey={sharedAccessKey};EntityPath={eventHubName}";
+
+        EventHubClient client = new EventHubClientBuilder()
+            .connectionString(connectionString)
+            .buildClient();
+        // END: com.azure.messaging.eventhubs.eventhubclient.instantiation
+
+        client.close();
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
new file mode 100644
index 000000000000..a525234d4bad
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/EventHubProducerJavaDocCodeSamples.java
@@ -0,0 +1,111 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.RetryOptions;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * Contains code snippets when generating javadocs through doclets for {@link EventHubProducer}.
+ */
+public class EventHubProducerJavaDocCodeSamples {
+    private final EventHubClient client = new EventHubClientBuilder()
+        .connectionString("fake-string")
+        .buildClient();
+
+    /**
+     * Code snippet demonstrating how to create an {@link EventHubProducer} that automatically routes events to any
+     * partition.
+     *
+     * @throws IOException if the producer cannot be disposed.
+     */
+    public void instantiate() throws IOException {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.instantiation
+        EventHubClient client = new EventHubClientBuilder()
+            .connectionString("event-hubs-namespace-connection-string", "event-hub-name")
+            .buildClient();
+
+        EventHubProducer producer = client.createProducer();
+        // END: com.azure.messaging.eventhubs.eventhubproducer.instantiation
+
+        producer.close();
+    }
+
+    /**
+     * Code snippet demonstrating how to create an {@link EventHubProducer} that routes events to a single partition.
+     *
+     * @throws IOException if the producer cannot be disposed.
+     */
+    public void instantiatePartitionProducer() throws IOException {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.instantiation#partitionId
+        RetryOptions retryOptions = new RetryOptions()
+            .tryTimeout(Duration.ofSeconds(45));
+        EventHubProducerOptions options = new EventHubProducerOptions()
+            .partitionId("foo")
+            .retry(retryOptions);
+
+        EventHubProducer producer = client.createProducer(options);
+        // END: com.azure.messaging.eventhubs.eventhubproducer.instantiation#partitionId
+
+        producer.close();
+    }
+
+    /**
+     * Code snippet demonstrating how to send events with a partition key.
+     */
+    public void sendEventsSendOptions() {
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.send#publisher-sendOptions
+        final List<EventData> events = Arrays.asList(
+            new EventData("sourdough".getBytes(UTF_8)),
+            new EventData("rye".getBytes(UTF_8)),
+            new EventData("wheat".getBytes(UTF_8))
+        );
+
+        final EventHubProducer producer = client.createProducer();
+        final SendOptions options = new SendOptions()
+            .partitionKey("bread");
+
+        producer.send(events, options);
+        // END: com.azure.messaging.eventhubs.eventhubproducer.send#publisher-sendOptions
+    }
+
+    /**
+     * Code snippet demonstrating how to create an {@link EventDataBatch} and send it.
+     */
+    public void sendEventDataBatch() {
+        final EventHubProducer producer = client.createProducer();
+
+        // BEGIN: com.azure.messaging.eventhubs.eventhubproducer.send#eventDataBatch
+        final List<EventData> telemetryEvents = Arrays.asList(
+            new EventData("92".getBytes(UTF_8)).addProperty("telemetry", "latency"),
+            new EventData("98".getBytes(UTF_8)).addProperty("telemetry", "cpu-temperature"),
+            new EventData("120".getBytes(UTF_8)).addProperty("telemetry", "fps")
+        );
+
+        final BatchOptions options = new BatchOptions()
+            .partitionKey("telemetry")
+            .maximumSizeInBytes(256);
+
+        EventDataBatch currentBatch = producer.createBatch(options);
+
+        // For each telemetry event, we try to add it to the current batch.
+        // When the batch is full, send it then create another batch to add more events to.
+        for (EventData event : telemetryEvents) {
+            if (!currentBatch.tryAdd(event)) {
+                producer.send(currentBatch);
+                currentBatch = producer.createBatch(options);
+            }
+        }
+        // END: com.azure.messaging.eventhubs.eventhubproducer.send#eventDataBatch
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncClientIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncClientIntegrationTest.java
new file mode 100644
index 000000000000..c6f2c028eeea
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncClientIntegrationTest.java
@@ -0,0 +1,204 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.TransportType;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.messaging.eventhubs.implementation.ApiTestBase;
+import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
+import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
+import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import reactor.core.Disposable;
+import reactor.core.Disposables;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.azure.messaging.eventhubs.EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME;
+import static com.azure.messaging.eventhubs.TestUtils.isMatchingEvent;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * Tests scenarios on {@link EventHubAsyncClient}.
+ */
+@RunWith(Parameterized.class)
+public class EventHubAsyncClientIntegrationTest extends ApiTestBase {
+    private static final int NUMBER_OF_EVENTS = 5;
+
+    @Parameterized.Parameters(name = "{index}: transportType={0}")
+    public static Iterable<Object> getTransportTypes() {
+        return Arrays.asList(TransportType.AMQP, TransportType.AMQP_WEB_SOCKETS);
+    }
+
+    private static final String PARTITION_ID = "1";
+    private static final AtomicBoolean HAS_PUSHED_EVENTS = new AtomicBoolean();
+    private static final AtomicReference<Instant> MESSAGES_PUSHED_INSTANT = new AtomicReference<>();
+    private static final String MESSAGE_TRACKING_VALUE = UUID.randomUUID().toString();
+
+    private EventHubAsyncClient client;
+
+    @Rule
+    public TestName testName = new TestName();
+
+    public EventHubAsyncClientIntegrationTest(TransportType transportType) {
+        super(new ClientLogger(EventHubAsyncClientIntegrationTest.class));
+
+        setTransportType(transportType);
+    }
+
+    @Override
+    protected String testName() {
+        return testName.getMethodName();
+    }
+
+    @Override
+    protected void beforeTest() {
+        skipIfNotRecordMode();
+
+        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
+        final ConnectionOptions connectionOptions = getConnectionOptions();
+
+        client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
+
+        setupEventTestData(client);
+    }
+
+    @Override
+    protected void afterTest() {
+        dispose(client);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void nullConstructor() throws NullPointerException {
+        new EventHubAsyncClient(null, null, null);
+    }
+
+    /**
+     * Verifies that we can receive messages, and that the receiver continues to fetch messages when the prefetch queue
+     * is exhausted.
+     */
+    @Test
+    public void receiveMessage() {
+        // Arrange
+        final EventHubConsumerOptions options = new EventHubConsumerOptions()
+            .prefetchCount(2);
+        final EventHubAsyncConsumer consumer = client.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
+            EventPosition.fromEnqueuedTime(MESSAGES_PUSHED_INSTANT.get()), options);
+
+        // Act & Assert
+        StepVerifier.create(consumer.receive().filter(x -> isMatchingEvent(x, MESSAGE_TRACKING_VALUE)).take(NUMBER_OF_EVENTS))
+            .expectNextCount(NUMBER_OF_EVENTS)
+            .verifyComplete();
+    }
+
+    /**
+     * Verifies that we can have multiple consumers listening to the same partition + consumer group at the same time.
+     */
+    @Ignore("Investigate. Only 2 of the 4 consumers get the events. The other two consumers do not.")
+    @Test
+    public void parallelEventHubClients() throws InterruptedException {
+        skipIfNotRecordMode();
+
+        // Arrange
+        final int numberOfClients = 4;
+        final int numberOfEvents = 10;
+        final String messageTrackingId = "message-tracking-id";
+        final String messageTrackingValue = UUID.randomUUID().toString();
+        final Flux<EventData> events = Flux.range(0, numberOfEvents).map(number -> {
+            final EventData eventData = new EventData("testString".getBytes(UTF_8));
+            eventData.addProperty(messageTrackingId, messageTrackingValue);
+            return eventData;
+        });
+
+        final CountDownLatch countDownLatch = new CountDownLatch(numberOfClients);
+        final EventHubAsyncClient[] clients = new EventHubAsyncClient[numberOfClients];
+        for (int i = 0; i < numberOfClients; i++) {
+            clients[i] = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), new ReactorHandlerProvider(getReactorProvider()));
+        }
+
+        final EventHubAsyncProducer producer = clients[0].createProducer(new EventHubProducerOptions().partitionId(PARTITION_ID));
+        final List<EventHubAsyncConsumer> consumers = new ArrayList<>();
+        final Disposable.Composite subscriptions = Disposables.composite();
+
+        try {
+            for (final EventHubAsyncClient hubClient : clients) {
+                final EventHubAsyncConsumer consumer = hubClient.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
+                consumers.add(consumer);
+
+                final Disposable subscription = consumer.receive().filter(event -> {
+                    return event.properties() != null
+                        && event.properties().containsKey(messageTrackingId)
+                        && messageTrackingValue.equals(event.properties().get(messageTrackingId));
+                }).take(numberOfEvents).subscribe(event -> {
+                    logger.info("Event[{}] matched.", event.sequenceNumber());
+                }, error -> Assert.fail("An error should not have occurred:" + error.toString()), () -> {
+                        long count = countDownLatch.getCount();
+                        logger.info("Finished consuming events. Counting down: {}", count);
+                        countDownLatch.countDown();
+                    });
+
+                subscriptions.add(subscription);
+            }
+
+            // Act
+            producer.send(events).block(TIMEOUT);
+
+            // Assert
+            // Wait for all the events we sent to be received by each of the consumers.
+            countDownLatch.await(TIMEOUT.getSeconds(), TimeUnit.SECONDS);
+            Assert.assertEquals(0, countDownLatch.getCount());
+
+            logger.info("Completed successfully.");
+        } finally {
+            logger.info("Disposing of subscriptions, consumers and clients.");
+            subscriptions.dispose();
+
+            dispose(producer);
+            dispose(consumers.toArray(new EventHubAsyncConsumer[0]));
+            dispose(clients);
+        }
+    }
+
+    /**
+     * When we run this test, we check if there have been events already pushed to the partition, if not, we push some
+     * events there.
+     */
+    private void setupEventTestData(EventHubAsyncClient client) {
+        if (HAS_PUSHED_EVENTS.getAndSet(true)) {
+            logger.info("Already pushed events to partition. Skipping.");
+            return;
+        }
+
+        logger.info("Pushing events to partition. Message tracking value: {}", MESSAGE_TRACKING_VALUE);
+
+        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
+        final EventHubAsyncProducer producer = client.createProducer(producerOptions);
+        final Flux<EventData> events = TestUtils.getEvents(NUMBER_OF_EVENTS, MESSAGE_TRACKING_VALUE);
+
+        try {
+            MESSAGES_PUSHED_INSTANT.set(Instant.now());
+            producer.send(events).block(TIMEOUT);
+        } finally {
+            dispose(producer);
+        }
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java
index 11b676fdffa5..1741a14c08c7 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerIntegrationTest.java
@@ -3,15 +3,10 @@
 
 package com.azure.messaging.eventhubs;
 
-import com.azure.core.amqp.TransportType;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
-import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
-import com.azure.messaging.eventhubs.implementation.ConnectionStringProperties;
-import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
 import com.azure.messaging.eventhubs.models.BatchOptions;
 import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
-import com.azure.messaging.eventhubs.models.ProxyConfiguration;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,13 +40,13 @@ protected String testName() {
 
     @Override
     protected void beforeTest() {
-        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        final ConnectionStringProperties properties = new ConnectionStringProperties(getConnectionString());
-        final ConnectionOptions connectionOptions = new ConnectionOptions(properties.endpoint().getHost(),
-            properties.eventHubName(), getTokenCredential(), getAuthorizationType(), TransportType.AMQP, RETRY_OPTIONS,
-            ProxyConfiguration.SYSTEM_DEFAULTS, Schedulers.parallel());
+        skipIfNotRecordMode();
 
-        client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
+        client = new EventHubClientBuilder()
+            .connectionString(getConnectionString())
+            .retry(RETRY_OPTIONS)
+            .scheduler(Schedulers.parallel())
+            .buildAsyncClient();
     }
 
     @Override
@@ -64,8 +59,6 @@ protected void afterTest() {
      */
     @Test
     public void sendMessageToPartition() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
         final List<EventData> events = Arrays.asList(
@@ -86,8 +79,6 @@ public void sendMessageToPartition() throws IOException {
      */
     @Test
     public void sendMessage() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final List<EventData> events = Arrays.asList(
             new EventData("Event 1".getBytes(UTF_8)),
@@ -106,8 +97,6 @@ public void sendMessage() throws IOException {
      */
     @Test
     public void sendBatch() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final List<EventData> events = Arrays.asList(
             new EventData("Event 1".getBytes(UTF_8)),
@@ -134,8 +123,6 @@ public void sendBatch() throws IOException {
      */
     @Test
     public void sendBatchWithPartitionKey() throws IOException {
-        skipIfNotRecordMode();
-
         // Arrange
         final List<EventData> events = Arrays.asList(
             new EventData("Event 1".getBytes(UTF_8)),
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java
index eaf3bc89e17a..76892d08ac55 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubAsyncProducerTest.java
@@ -68,7 +68,7 @@ public void teardown() {
     public void sendMultipleMessages() {
         // Arrange
         final int count = 4;
-        final byte[] contents = CONTENTS.getBytes(UTF_8);
+        final byte[] contents = TEST_CONTENTS.getBytes(UTF_8);
         final Flux<EventData> testData = Flux.range(0, count).flatMap(number -> {
             final EventData data = new EventData(contents);
             return Flux.just(data);
@@ -100,7 +100,7 @@ public void sendMultipleMessages() {
     @Test
     public void sendSingleMessage() {
         // Arrange
-        final EventData testData = new EventData(CONTENTS.getBytes(UTF_8));
+        final EventData testData = new EventData(TEST_CONTENTS.getBytes(UTF_8));
 
         when(sendLink.send(any(Message.class))).thenReturn(Mono.empty());
 
@@ -128,8 +128,8 @@ public void sendSingleMessage() {
     public void partitionProducerCannotSendWithPartitionKey() {
         // Arrange
         final Flux<EventData> testData = Flux.just(
-            new EventData(CONTENTS.getBytes(UTF_8)),
-            new EventData(CONTENTS.getBytes(UTF_8)));
+            new EventData(TEST_CONTENTS.getBytes(UTF_8)),
+            new EventData(TEST_CONTENTS.getBytes(UTF_8)));
 
         when(sendLink.send(anyList())).thenReturn(Mono.empty());
 
@@ -163,7 +163,7 @@ public void sendTooManyMessages() {
 
         // We believe 20 events is enough for that EventDataBatch to be greater than max size.
         final Flux<EventData> testData = Flux.range(0, 20).flatMap(number -> {
-            final EventData data = new EventData(CONTENTS.getBytes(UTF_8));
+            final EventData data = new EventData(TEST_CONTENTS.getBytes(UTF_8));
             return Flux.just(data);
         });
 
@@ -378,7 +378,7 @@ public void sendsAnEventDataBatch() {
         verify(link, times(2)).getLinkSize();
     }
 
-    private static final String CONTENTS = "SSLorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vehicula posuere lobortis. Aliquam finibus volutpat dolor, faucibus pellentesque ipsum bibendum vitae. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut sit amet urna hendrerit, dapibus justo a, sodales justo. Mauris finibus augue id pulvinar congue. Nam maximus luctus ipsum, at commodo ligula euismod ac. Phasellus vitae lacus sit amet diam porta placerat. \n"
+    static final String TEST_CONTENTS = "SSLorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vehicula posuere lobortis. Aliquam finibus volutpat dolor, faucibus pellentesque ipsum bibendum vitae. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut sit amet urna hendrerit, dapibus justo a, sodales justo. Mauris finibus augue id pulvinar congue. Nam maximus luctus ipsum, at commodo ligula euismod ac. Phasellus vitae lacus sit amet diam porta placerat. \n"
         + "Ut sodales efficitur sapien ut posuere. Morbi sed tellus est. Proin eu erat purus. Proin massa nunc, condimentum id iaculis dignissim, consectetur et odio. Cras suscipit sem eu libero aliquam tincidunt. Nullam ut arcu suscipit, eleifend velit in, cursus libero. Ut eleifend facilisis odio sit amet feugiat. Phasellus at nunc sit amet elit sagittis commodo ac in nisi. Fusce vitae aliquam quam. Integer vel nibh euismod, tempus elit vitae, pharetra est. Duis vulputate enim a elementum dignissim. Morbi dictum enim id elit scelerisque, in elementum nulla pharetra. \n"
         + "Aenean aliquet aliquet condimentum. Proin dapibus dui id libero tempus feugiat. Sed commodo ligula a lectus mattis, vitae tincidunt velit auctor. Fusce quis semper dui. Phasellus eu efficitur sem. Ut non sem sit amet enim condimentum venenatis id dictum massa. Nullam sagittis lacus a neque sodales, et ultrices arcu mattis. Aliquam erat volutpat. \n"
         + "Aenean fringilla quam elit, id mattis purus vestibulum nec. Praesent porta eros in dapibus molestie. Vestibulum orci libero, tincidunt et turpis eget, condimentum lobortis enim. Fusce suscipit ante et mauris consequat cursus nec laoreet lorem. Maecenas in sollicitudin diam, non tincidunt purus. Nunc mauris purus, laoreet eget interdum vitae, placerat a sapien. In mi risus, blandit eu facilisis nec, molestie suscipit leo. Pellentesque molestie urna vitae dui faucibus bibendum. \n"
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
index 83eb91c70326..db8edc51cc50 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubClientIntegrationTest.java
@@ -3,66 +3,27 @@
 
 package com.azure.messaging.eventhubs;
 
-import com.azure.core.amqp.TransportType;
+import com.azure.core.http.rest.IterableResponse;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.messaging.eventhubs.implementation.ApiTestBase;
-import com.azure.messaging.eventhubs.implementation.ConnectionOptions;
-import com.azure.messaging.eventhubs.implementation.ReactorHandlerProvider;
-import com.azure.messaging.eventhubs.models.EventHubConsumerOptions;
-import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
-import com.azure.messaging.eventhubs.models.EventPosition;
+import com.azure.messaging.eventhubs.implementation.ConnectionStringProperties;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import reactor.core.Disposable;
-import reactor.core.Disposables;
-import reactor.core.publisher.Flux;
-import reactor.test.StepVerifier;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static com.azure.messaging.eventhubs.EventHubAsyncClient.DEFAULT_CONSUMER_GROUP_NAME;
-import static com.azure.messaging.eventhubs.TestUtils.isMatchingEvent;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- * Tests scenarios on {@link EventHubAsyncClient}.
- */
-@RunWith(Parameterized.class)
-public class EventHubClientIntegrationTest extends ApiTestBase {
-    private static final int NUMBER_OF_EVENTS = 5;
-
-    @Parameterized.Parameters(name = "{index}: transportType={0}")
-    public static Iterable<Object> getTransportTypes() {
-        return Arrays.asList(TransportType.AMQP, TransportType.AMQP_WEB_SOCKETS);
-    }
+import java.util.stream.Collectors;
 
-    private static final String PARTITION_ID = "1";
-    private static final AtomicBoolean HAS_PUSHED_EVENTS = new AtomicBoolean();
-    private static final AtomicReference<Instant> MESSAGES_PUSHED_INSTANT = new AtomicReference<>();
-    private static final String MESSAGE_TRACKING_VALUE = UUID.randomUUID().toString();
-
-    private EventHubAsyncClient client;
+public class EventHubClientIntegrationTest extends ApiTestBase {
+    private EventHubClient client;
 
     @Rule
     public TestName testName = new TestName();
 
-    public EventHubClientIntegrationTest(TransportType transportType) {
+    public EventHubClientIntegrationTest() {
         super(new ClientLogger(EventHubClientIntegrationTest.class));
-
-        setTransportType(transportType);
     }
 
     @Override
@@ -74,12 +35,10 @@ protected String testName() {
     protected void beforeTest() {
         skipIfNotRecordMode();
 
-        final ReactorHandlerProvider handlerProvider = new ReactorHandlerProvider(getReactorProvider());
-        final ConnectionOptions connectionOptions = getConnectionOptions();
-
-        client = new EventHubAsyncClient(connectionOptions, getReactorProvider(), handlerProvider);
-
-        setupEventTestData(client);
+        client = new EventHubClientBuilder()
+            .connectionString(getConnectionString())
+            .retry(RETRY_OPTIONS)
+            .buildClient();
     }
 
     @Override
@@ -87,118 +46,58 @@ protected void afterTest() {
         dispose(client);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullConstructor() throws NullPointerException {
-        new EventHubAsyncClient(null, null, null);
-    }
-
     /**
-     * Verifies that we can receive messages, and that the receiver continues to fetch messages when the prefetch queue
-     * is exhausted.
+     * Verifies we can get partition ids of an Event Hub.
      */
     @Test
-    public void receiveMessage() {
-        // Arrange
-        final EventHubConsumerOptions options = new EventHubConsumerOptions()
-            .prefetchCount(2);
-        final EventHubAsyncConsumer consumer = client.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID,
-            EventPosition.fromEnqueuedTime(MESSAGES_PUSHED_INSTANT.get()), options);
-
-        // Act & Assert
-        StepVerifier.create(consumer.receive().filter(x -> isMatchingEvent(x, MESSAGE_TRACKING_VALUE)).take(NUMBER_OF_EVENTS))
-            .expectNextCount(NUMBER_OF_EVENTS)
-            .verifyComplete();
+    public void getPartitionIds() {
+        // Act
+        final IterableResponse<String> response = client.getPartitionIds();
+
+        // Assert
+        Assert.assertNotNull(response);
+
+        final List<String> partitionIds = response.stream().collect(Collectors.toList());
+        Assert.assertTrue(partitionIds.size() > 1);
     }
 
     /**
-     * Verifies that we can have multiple consumers listening to the same partition + consumer group at the same time.
+     * Verifies we can get partition ids of an Event Hub.
      */
-    @Ignore("Investigate. Only 2 of the 4 consumers get the events. The other two consumers do not.")
     @Test
-    public void parallelEventHubClients() throws InterruptedException {
-        skipIfNotRecordMode();
-
+    public void getMetadata() {
         // Arrange
-        final int numberOfClients = 4;
-        final int numberOfEvents = 10;
-        final String messageTrackingId = "message-tracking-id";
-        final String messageTrackingValue = UUID.randomUUID().toString();
-        final Flux<EventData> events = Flux.range(0, numberOfEvents).map(number -> {
-            final EventData eventData = new EventData("testString".getBytes(UTF_8));
-            eventData.addProperty(messageTrackingId, messageTrackingValue);
-            return eventData;
-        });
-
-        final CountDownLatch countDownLatch = new CountDownLatch(numberOfClients);
-        final EventHubAsyncClient[] clients = new EventHubAsyncClient[numberOfClients];
-        for (int i = 0; i < numberOfClients; i++) {
-            clients[i] = new EventHubAsyncClient(getConnectionOptions(), getReactorProvider(), new ReactorHandlerProvider(getReactorProvider()));
-        }
-
-        final EventHubAsyncProducer producer = clients[0].createProducer(new EventHubProducerOptions().partitionId(PARTITION_ID));
-        final List<EventHubAsyncConsumer> consumers = new ArrayList<>();
-        final Disposable.Composite subscriptions = Disposables.composite();
-
-        try {
-            for (final EventHubAsyncClient hubClient : clients) {
-                final EventHubAsyncConsumer consumer = hubClient.createConsumer(DEFAULT_CONSUMER_GROUP_NAME, PARTITION_ID, EventPosition.latest());
-                consumers.add(consumer);
-
-                final Disposable subscription = consumer.receive().filter(event -> {
-                    return event.properties() != null
-                        && event.properties().containsKey(messageTrackingId)
-                        && messageTrackingValue.equals(event.properties().get(messageTrackingId));
-                }).take(numberOfEvents).subscribe(event -> {
-                    logger.info("Event[{}] matched.", event.sequenceNumber());
-                }, error -> Assert.fail("An error should not have occurred:" + error.toString()), () -> {
-                        long count = countDownLatch.getCount();
-                        logger.info("Finished consuming events. Counting down: {}", count);
-                        countDownLatch.countDown();
-                    });
-
-                subscriptions.add(subscription);
-            }
-
-            // Act
-            producer.send(events).block(TIMEOUT);
-
-            // Assert
-            // Wait for all the events we sent to be received by each of the consumers.
-            countDownLatch.await(TIMEOUT.getSeconds(), TimeUnit.SECONDS);
-            Assert.assertEquals(0, countDownLatch.getCount());
-
-            logger.info("Completed successfully.");
-        } finally {
-            logger.info("Disposing of subscriptions, consumers and clients.");
-            subscriptions.dispose();
-
-            dispose(producer);
-            dispose(consumers.toArray(new EventHubAsyncConsumer[0]));
-            dispose(clients);
-        }
+        final ConnectionStringProperties connectionProperties = getConnectionStringProperties();
+
+        // Act
+        final EventHubProperties properties = client.getProperties();
+
+        // Assert
+        Assert.assertNotNull(properties);
+        Assert.assertEquals(connectionProperties.eventHubName(), properties.name());
+        Assert.assertTrue(properties.createdAt().isBefore(Instant.now()));
+
+        Assert.assertNotNull(properties.partitionIds());
+        Assert.assertTrue(properties.partitionIds().length > 1);
     }
 
     /**
-     * When we run this test, we check if there have been events already pushed to the partition, if not, we push some
-     * events there.
+     * Verifies we can get partition ids of an Event Hub.
      */
-    private void setupEventTestData(EventHubAsyncClient client) {
-        if (HAS_PUSHED_EVENTS.getAndSet(true)) {
-            logger.info("Already pushed events to partition. Skipping.");
-            return;
-        }
-
-        logger.info("Pushing events to partition. Message tracking value: {}", MESSAGE_TRACKING_VALUE);
-
-        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
-        final EventHubAsyncProducer producer = client.createProducer(producerOptions);
-        final Flux<EventData> events = TestUtils.getEvents(NUMBER_OF_EVENTS, MESSAGE_TRACKING_VALUE);
-
-        try {
-            MESSAGES_PUSHED_INSTANT.set(Instant.now());
-            producer.send(events).block(TIMEOUT);
-        } finally {
-            dispose(producer);
-        }
+    @Test
+    public void getPartitionProperties() {
+        // Arrange
+        final ConnectionStringProperties connectionProperties = getConnectionStringProperties();
+        final EventHubProperties properties = client.getProperties();
+        final String partitionId = properties.partitionIds()[0];
+
+        // Act
+        final PartitionProperties partitionProperties = client.getPartitionProperties(partitionId);
+
+        // Assert
+        Assert.assertNotNull(partitionProperties);
+
+        Assert.assertEquals(connectionProperties.eventHubName(), partitionProperties.eventHubName());
+        Assert.assertEquals(partitionId, partitionProperties.id());
     }
 }
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerIntegrationTest.java
new file mode 100644
index 000000000000..524d7981611e
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerIntegrationTest.java
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.messaging.eventhubs.implementation.ApiTestBase;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import reactor.core.scheduler.Schedulers;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+public class EventHubProducerIntegrationTest extends ApiTestBase {
+    private static final String PARTITION_ID = "1";
+    private EventHubClient client;
+
+    public EventHubProducerIntegrationTest() {
+        super(new ClientLogger(EventHubProducerIntegrationTest.class));
+    }
+
+    @Rule
+    public TestName testName = new TestName();
+
+    @Override
+    protected String testName() {
+        return testName.getMethodName();
+    }
+
+    @Override
+    protected void beforeTest() {
+        skipIfNotRecordMode();
+
+        client = new EventHubClientBuilder()
+            .connectionString(getConnectionString())
+            .retry(RETRY_OPTIONS)
+            .scheduler(Schedulers.parallel())
+            .buildClient();
+    }
+
+    @Override
+    protected void afterTest() {
+        dispose(client);
+    }
+
+    /**
+     * Verifies that we can create and send a message to an Event Hub partition.
+     */
+    @Test
+    public void sendMessageToPartition() throws IOException {
+        // Arrange
+        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().partitionId(PARTITION_ID);
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer(producerOptions)) {
+            producer.send(events);
+        }
+    }
+
+    /**
+     * Verifies that we can create an {@link EventHubProducer} that does not care about partitions and lets the service
+     * distribute the events.
+     */
+    @Test
+    public void sendMessage() throws IOException {
+        // Arrange
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer()) {
+            producer.send(events);
+        }
+    }
+
+    /**
+     * Verifies we can create an {@link EventDataBatch} and send it using our EventHubProducer.
+     */
+    @Test
+    public void sendBatch() throws IOException {
+        // Arrange
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer()) {
+            EventDataBatch batch = producer.createBatch();
+            events.forEach(event -> {
+                Assert.assertTrue(batch.tryAdd(event));
+            });
+
+            producer.send(batch);
+        }
+    }
+
+    /**
+     * Verifies we can create an {@link EventDataBatch} with a partition key and send it using our EventHubProducer.
+     */
+    @Test
+    public void sendBatchWithPartitionKey() throws IOException {
+        // Arrange
+        final List<EventData> events = Arrays.asList(
+            new EventData("Event 1".getBytes(UTF_8)),
+            new EventData("Event 2".getBytes(UTF_8)),
+            new EventData("Event 3".getBytes(UTF_8)));
+
+        // Act & Assert
+        try (EventHubProducer producer = client.createProducer()) {
+            final BatchOptions options = new BatchOptions().partitionKey("my-partition-key");
+            final EventDataBatch batch = producer.createBatch(options);
+
+            events.forEach(event -> {
+                Assert.assertTrue(batch.tryAdd(event));
+            });
+
+            producer.send(batch);
+        }
+    }
+}
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java
new file mode 100644
index 000000000000..db2fae439f3b
--- /dev/null
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerTest.java
@@ -0,0 +1,215 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.messaging.eventhubs;
+
+import com.azure.core.amqp.RetryOptions;
+import com.azure.core.amqp.exception.AmqpException;
+import com.azure.core.amqp.exception.ErrorCondition;
+import com.azure.core.amqp.exception.ErrorContext;
+import com.azure.messaging.eventhubs.implementation.AmqpSendLink;
+import com.azure.messaging.eventhubs.models.BatchOptions;
+import com.azure.messaging.eventhubs.models.EventHubProducerOptions;
+import com.azure.messaging.eventhubs.models.SendOptions;
+import org.apache.qpid.proton.amqp.messaging.Section;
+import org.apache.qpid.proton.message.Message;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.util.List;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests to verify functionality of {@link EventHubProducer}.
+ */
+public class EventHubProducerTest {
+    @Mock
+    private AmqpSendLink sendLink;
+    @Captor
+    private ArgumentCaptor<Message> singleMessageCaptor;
+    @Captor
+    private ArgumentCaptor<List<Message>> messagesCaptor;
+
+    private EventHubAsyncProducer asyncProducer;
+    private RetryOptions retryOptions = new RetryOptions().tryTimeout(Duration.ofSeconds(30));
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(sendLink.getLinkSize()).thenReturn(Mono.just(EventHubAsyncProducer.MAX_MESSAGE_LENGTH_BYTES));
+        when(sendLink.getErrorContext()).thenReturn(new ErrorContext("test-namespace"));
+        when(sendLink.send(anyList())).thenReturn(Mono.empty());
+        when(sendLink.send(any(Message.class))).thenReturn(Mono.empty());
+
+        asyncProducer = new EventHubAsyncProducer(
+            Mono.fromCallable(() -> sendLink),
+            new EventHubProducerOptions().retry(retryOptions));
+    }
+
+    @After
+    public void teardown() {
+        Mockito.framework().clearInlineMocks();
+        sendLink = null;
+        singleMessageCaptor = null;
+        messagesCaptor = null;
+    }
+
+    /**
+     * Verifies can send a single message.
+     */
+    @Test
+    public void sendSingleMessage() {
+        // Arrange
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+        final EventData eventData = new EventData("hello-world".getBytes(UTF_8));
+
+        // Act
+        producer.send(eventData);
+
+        // Assert
+        verify(sendLink, times(1)).send(any(Message.class));
+        verify(sendLink).send(singleMessageCaptor.capture());
+
+        final Message message = singleMessageCaptor.getValue();
+        Assert.assertEquals(Section.SectionType.Data, message.getBody().getType());
+    }
+
+    /**
+     * Verifies we can send multiple messages.
+     */
+    @Test
+    public void sendMultipleMessages() {
+        // Arrange
+        final int count = 4;
+        final Iterable<EventData> events = Flux.range(0, count).map(number -> {
+            final String contents = "event-data-" + number;
+            return new EventData(contents.getBytes(UTF_8));
+        }).toIterable();
+
+        final SendOptions options = new SendOptions();
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+
+        // Act
+        producer.send(events, options);
+
+        // Assert
+        verify(sendLink).send(messagesCaptor.capture());
+
+        final List<Message> messagesSent = messagesCaptor.getValue();
+        Assert.assertEquals(count, messagesSent.size());
+
+        messagesSent.forEach(message -> Assert.assertEquals(Section.SectionType.Data, message.getBody().getType()));
+    }
+
+    /**
+     * Verifies that the producer can create an {@link EventDataBatch} with the size given by the underlying AMQP send
+     * link.
+     */
+    @Test
+    public void createsEventDataBatch() {
+        // Arrange
+        int maxLinkSize = 1024;
+
+        // Overhead when serializing an event, to figure out what the maximum size we can use for an event payload.
+        int eventOverhead = 24;
+        int maxEventPayload = maxLinkSize - eventOverhead;
+
+        final AmqpSendLink link = mock(AmqpSendLink.class);
+        when(link.getLinkSize()).thenReturn(Mono.just(maxLinkSize));
+
+        // This event is 1024 bytes when serialized.
+        final EventData event = new EventData(new byte[maxEventPayload]);
+
+        // This event will be 1025 bytes when serialized.
+        final EventData tooLargeEvent = new EventData(new byte[maxEventPayload + 1]);
+
+        final EventHubProducerOptions producerOptions = new EventHubProducerOptions().retry(retryOptions);
+        final EventHubAsyncProducer hubAsyncProducer = new EventHubAsyncProducer(Mono.fromCallable(() -> link), producerOptions);
+        final EventHubProducer hubProducer = new EventHubProducer(hubAsyncProducer, retryOptions.tryTimeout());
+
+        // Act
+        final EventDataBatch batch = hubProducer.createBatch();
+
+        // Assert
+        Assert.assertNull(batch.getPartitionKey());
+        Assert.assertFalse(batch.tryAdd(tooLargeEvent));
+        Assert.assertTrue(batch.tryAdd(event));
+
+        verify(link, times(1)).getLinkSize();
+    }
+
+    /**
+     * Verifies we can create an EventDataBatch with partition key and link size.
+     */
+    @Test
+    public void createsEventDataBatchWithPartitionKey() {
+        // Arrange
+        int maxBatchSize = 1024;
+
+        // Overhead when serializing an event, to figure out what the maximum size we can use for an event payload.
+        int eventOverhead = 98;
+        int maxEventPayload = maxBatchSize - eventOverhead;
+
+        // This event is 1024 bytes when serialized.
+        final EventData event = new EventData(new byte[maxEventPayload]);
+
+        // No idea what the overhead for adding partition key is. But we know this will be smaller than the max size.
+        final BatchOptions options = new BatchOptions()
+            .partitionKey("some-key")
+            .maximumSizeInBytes(maxBatchSize);
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+
+        // Act
+        final EventDataBatch batch = producer.createBatch(options);
+
+        // Arrange
+        Assert.assertEquals(options.partitionKey(), batch.getPartitionKey());
+        Assert.assertTrue(batch.tryAdd(event));
+    }
+
+    /**
+     * Verifies we can create an EventDataBatch with partition key and link size.
+     */
+    @Test
+    public void payloadTooLarge() {
+        // Arrange
+        int maxBatchSize = 1024;
+
+        // Overhead when serializing an event, to figure out what the maximum size we can use for an event payload.
+        int eventOverhead = 24;
+        int maxEventPayload = maxBatchSize - eventOverhead;
+
+        // This event is 1025 bytes when serialized.
+        final EventData event = new EventData(new byte[maxEventPayload + 1]);
+
+        // No idea what the overhead for adding partition key is. But we know this will be smaller than the max size.
+        final BatchOptions options = new BatchOptions()
+            .maximumSizeInBytes(maxBatchSize);
+        final EventHubProducer producer = new EventHubProducer(asyncProducer, retryOptions.tryTimeout());
+        final EventDataBatch batch = producer.createBatch(options);
+
+        // Act & Assert
+        try {
+            batch.tryAdd(event);
+        } catch (AmqpException e) {
+            Assert.assertEquals(ErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED, e.getErrorCondition());
+        }
+    }
+}

From baf1f4717c676c6ef44b9eb27ad79b6eefc15ada Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Wed, 14 Aug 2019 14:10:56 -0700
Subject: [PATCH 10/22] Split the eventhubs client and data pipelines. (#4995)

* Split the eventhubs client and data pipelines.

* Removed redundant modules section.

* Specified artifacts for data pipeline.
---
 sdk/eventhubs/ci.data.yml     | 46 ++++++++++++++++++++++++++++++++++
 sdk/eventhubs/ci.yml          |  4 +++
 sdk/eventhubs/pom.service.xml | 47 +++++++++++++++++++++++++----------
 3 files changed, 84 insertions(+), 13 deletions(-)
 create mode 100644 sdk/eventhubs/ci.data.yml

diff --git a/sdk/eventhubs/ci.data.yml b/sdk/eventhubs/ci.data.yml
new file mode 100644
index 000000000000..7ca44a5f51c8
--- /dev/null
+++ b/sdk/eventhubs/ci.data.yml
@@ -0,0 +1,46 @@
+# DO NOT EDIT THIS FILE
+# This file is generated automatically and any changes will be lost.
+
+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/eventhubs/
+    exclude:
+      - sdk/eventhubs/azure
+
+pr:
+  branches:
+    include:
+      - master
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/eventhubs/
+    exclude:
+      - sdk/eventhubs/azure
+
+stages:
+  - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+    parameters:
+      ServiceDirectory: eventhubs
+      Artifacts:
+        - name: azure-eventhubs
+          safeName: azureeventhubs
+        - name: azure-eventhubs-eph
+          safeName: azureeventhubseph
+        - name: azure-eventhubs-extensions
+          safeName: azureeventhubsextensions
diff --git a/sdk/eventhubs/ci.yml b/sdk/eventhubs/ci.yml
index 9ecb29dd5ea3..4b074d49cf9b 100644
--- a/sdk/eventhubs/ci.yml
+++ b/sdk/eventhubs/ci.yml
@@ -17,6 +17,8 @@ trigger:
   paths:
     include:
       - sdk/eventhubs/
+    exclude:
+      - sdk/eventhubs/microsoft-azure
 
 pr:
   branches:
@@ -28,6 +30,8 @@ pr:
   paths:
     include:
       - sdk/eventhubs/
+    exclude:
+      - sdk/eventhubs/microsoft-azure
 
 stages:
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
diff --git a/sdk/eventhubs/pom.service.xml b/sdk/eventhubs/pom.service.xml
index f99125abb872..9c863056e145 100644
--- a/sdk/eventhubs/pom.service.xml
+++ b/sdk/eventhubs/pom.service.xml
@@ -1,20 +1,41 @@
 <!-- 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">
+<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-eventhubs-service</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <modules>
-    <module>microsoft-azure-eventhubs</module>
-    <module>microsoft-azure-eventhubs-eph</module>
-    <module>microsoft-azure-eventhubs-extensions</module>
-    <module>../core/azure-core</module>
-    <module>../core/azure-core-test</module>
-    <module>../core/azure-core-amqp</module>
-    <module>azure-messaging-eventhubs</module>
-  </modules>
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <profiles>
+    <profile>
+      <id>data</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>microsoft-azure-eventhubs</module>
+        <module>microsoft-azure-eventhubs-eph</module>
+        <module>microsoft-azure-eventhubs-extensions</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>client</id>
+      <activation>
+        <property>
+          <name>env.SDKTYPE</name>
+          <value>!data</value>
+        </property>
+      </activation>
+      <modules>
+        <module>../core/azure-core</module>
+        <module>../core/azure-core-test</module>
+        <module>../core/azure-core-amqp</module>
+        <module>azure-messaging-eventhubs</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>

From 484e9a4512b5b7494e0afdfa48cdb9f14dd4f495 Mon Sep 17 00:00:00 2001
From: Connie Yau <conniey@microsoft.com>
Date: Wed, 14 Aug 2019 15:10:32 -0700
Subject: [PATCH 11/22] Add null check to fix spotbugs warning. (#4998)

---
 .../java/com/azure/messaging/eventhubs/ConsumeEvent.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java
index 89f7b0f63257..2f33f372ba32 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java/com/azure/messaging/eventhubs/ConsumeEvent.java
@@ -51,6 +51,11 @@ public static void main(String[] args) throws InterruptedException, IOException
         // TimeoutException is thrown.
         String firstPartition = client.getPartitionIds().blockFirst(OPERATION_TIMEOUT);
 
+        // This shouldn't happen, but if we are unable to get the partitions within the timeout period.
+        if (firstPartition == null) {
+            firstPartition = "0";
+        }
+
         // Create a consumer.
         // The "$Default" consumer group is created by default. This value can be found by going to the Event Hub
         // instance you are connecting to, and selecting the "Consumer groups" page. EventPosition.latest() tells the

From 55e3509c3f0eb7b5a903188a0958eeabcabf2885 Mon Sep 17 00:00:00 2001
From: Jonathan Giles <jonathan.giles@microsoft.com>
Date: Thu, 15 Aug 2019 10:54:17 +1200
Subject: [PATCH 12/22] Seeing if we can speed up spotbugs (#4988)

* Seeing if we can speed up spotbugs by not forking the JVM for each module
---
 pom.client.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.client.xml b/pom.client.xml
index 76ca1105732d..617d50a5b8ae 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -164,12 +164,13 @@
           </dependency>
         </dependencies>
         <configuration>
-          <effort>Max</effort>
+          <effort>max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
           <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
           <excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
           <failOnError>true</failOnError>
+          <fork>false</fork>
         </configuration>
         <executions>
           <execution>
@@ -442,12 +443,13 @@
             </dependency>
           </dependencies>
           <configuration>
-            <effort>Max</effort>
+            <effort>max</effort>
             <threshold>Low</threshold>
             <xmlOutput>true</xmlOutput>
             <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
             <excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
             <failOnError>true</failOnError>
+            <fork>false</fork>
           </configuration>
         </plugin>
 
@@ -515,12 +517,13 @@
         <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${spotbugs.maven.version}</version>
         <configuration>
-          <effort>Max</effort>
+          <effort>max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
           <spotbugsXmlOutputDirectory>${project.build.directory}/spotbugs</spotbugsXmlOutputDirectory>
           <excludeFilterFile>eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml</excludeFilterFile>
           <failOnError>true</failOnError>
+          <fork>false</fork>
         </configuration>
       </plugin>
       <plugin>

From 5fbd93c345f58722aa057a249c0b8f7d4f6edb4e Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Wed, 14 Aug 2019 21:17:38 -0700
Subject: [PATCH 13/22] Enabling javadoc production for template. (#4963)

---
 pom.client.xml                          | 10 +++++-----
 sdk/template/azure-sdk-template/pom.xml | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pom.client.xml b/pom.client.xml
index 617d50a5b8ae..525ed2caf70b 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -1,7 +1,7 @@
 <!-- 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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azure</groupId>
   <artifactId>azure-client-sdk-parent</artifactId>
@@ -342,7 +342,6 @@
             </footer>
             <linksource>false</linksource>
             <excludePackageNames>
-              com.microsoft.azure.template:
               *.impl*:
               *.implementation*:
               com.azure.tools.checkstyle*
@@ -731,12 +730,13 @@
         <module>./eng/jacoco-test-coverage</module>
       </modules>
     </profile>
-
+    
     <profile>
       <id>template-module</id>
       <activation>
         <property>
-          <name>include-template</name>
+          <name>env.ENABLETEMPLATEDOCS</name>
+          <value>true</value>
         </property>
       </activation>
       <modules>
diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml
index 3c5ff41f6fc2..0d15dd67d620 100644
--- a/sdk/template/azure-sdk-template/pom.xml
+++ b/sdk/template/azure-sdk-template/pom.xml
@@ -1,17 +1,16 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.3.0</version>
     <relativePath>../../../pom.client.xml</relativePath>
   </parent>
 
   <artifactId>azure-sdk-template</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <version>1.0.2</version>
 
   <name>Microsoft Azure SDK for Template</name>
   <description>This package contains Microsoft Azure SDK for Template.</description>
@@ -23,9 +22,16 @@
     </site>
   </distributionManagement>
 
-  <scm><url>https://github.com/Azure/azure-sdk-for-java</url></scm>
+  <scm>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
+  </scm>
 
   <dependencies>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core</artifactId>
+      <version>1.0.0-preview.3</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

From d043adc5ee90b68ca91e2baee92ca53bec394146 Mon Sep 17 00:00:00 2001
From: Adrian Hall <adhal@microsoft.com>
Date: Thu, 15 Aug 2019 08:53:00 -0700
Subject: [PATCH 14/22] Update link to Java Guidelines. (#4842)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3a89fec4d97e..a93b2e3fb049 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Each service might have a number of libraries available from each of the followi
 * [Management](#Management)
 
 ### Client: July 2019 Preview
-New wave of packages that we are currently releasing in **preview**. These libraries follow the [Azure SDK Design Guidelines for Java](https://azuresdkspecs.z5.web.core.windows.net/JavaSpec.html) and share a number of core features such as HTTP retries, logging, transport protocols, authentication protocols, etc., so that once you learn how to use these features in one client library, you will know how to use them in other client libraries. You can learn about these shared features [here](core).
+New wave of packages that we are currently releasing in **preview**. These libraries follow the [Azure SDK Design Guidelines for Java](https://azure.github.io/azure-sdk/java/guidelines/) and share a number of core features such as HTTP retries, logging, transport protocols, authentication protocols, etc., so that once you learn how to use these features in one client library, you will know how to use them in other client libraries. You can learn about these shared features [here](core). 
 
 These preview libraries can be easily identified by their folder, package, and namespaces names starting with `azure-`, e.g. `azure-keyvault`.
 

From 3f0befefc20431aa6f658f85c12555e93cd34cfa Mon Sep 17 00:00:00 2001
From: Shawn Fang <45607042+mssfang@users.noreply.github.com>
Date: Thu, 15 Aug 2019 08:59:06 -0700
Subject: [PATCH 15/22] Fixes on Check on checkstyle (#5003)

* remove java code isImple check but move to suppression and add only check for public class for external Dependency check

* fixes

* Update eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

suggest changes on comments

Co-Authored-By: Connie Yau <conniey@microsoft.com>
---
 .../checks/OnlyFinalFieldsForImmutableClassCheck.java       | 6 +++---
 .../tools/checkstyle/checks/ServiceClientBuilderCheck.java  | 2 +-
 .../main/java/com/azure/tools/checkstyle/checks/Utils.java  | 5 ++++-
 .../main/resources/checkstyle/checkstyle-suppressions.xml   | 3 +++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java
index 85252a28a214..916c7533859f 100644
--- a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java
+++ b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/OnlyFinalFieldsForImmutableClassCheck.java
@@ -1,5 +1,5 @@
-// Licensed under the MIT License.
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 package com.azure.tools.checkstyle.checks;
 
@@ -19,8 +19,8 @@
  */
 public class OnlyFinalFieldsForImmutableClassCheck extends AbstractCheck {
     private static final String IMMUTABLE_NOTATION = "Immutable";
-    private static final String ERROR_MSG = "The variable field ''%s'' should be final." +
-        "Classes annotated with @Immutable are supposed to be immutable.";
+    private static final String ERROR_MSG = "The variable field ''%s'' should be final."
+        + "Classes annotated with @Immutable are supposed to be immutable.";
 
     private boolean hasImmutableAnnotation;
 
diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java
index 8623828a9c63..417643ccc4f8 100644
--- a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java
+++ b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientBuilderCheck.java
@@ -90,7 +90,7 @@ public void visitToken(DetailAST token) {
                 // method name has prefix 'build' but not 'build*Client' or 'build*AsyncClient'
                 if (!methodName.endsWith("Client")) {
                     log(token, String.format(
-                        "@ServiceClientBuilder class should not have a method name, ''%s'' starting with ''build'' but not ending with ''Client''." , methodName));
+                        "@ServiceClientBuilder class should not have a method name, ''%s'' starting with ''build'' but not ending with ''Client''.", methodName));
                 }
                 break;
             default:
diff --git a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java
index 5cc32d5249c2..11ff09b1b760 100644
--- a/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java
+++ b/eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/Utils.java
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.tools.checkstyle.checks;
 
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
@@ -39,7 +42,7 @@ protected static boolean hasIllegalCombination(DetailAST modifiers) {
         Optional<DetailAST> illegalCombination = TokenUtil.findFirstTokenByPredicate(modifiers, (node) -> {
             final int type = node.getType();
             return INVALID_FINAL_COMBINATION.contains(node.getType()) || (TokenTypes.ANNOTATION == type
-            && INVALID_FINAL_ANNOTATIONS.contains(node.findFirstToken(TokenTypes.IDENT).getText()));
+                && INVALID_FINAL_ANNOTATIONS.contains(node.findFirstToken(TokenTypes.IDENT).getText()));
         });
 
         return illegalCombination.isPresent();
diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
index 553c34ca080f..916cd16a7796 100755
--- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
+++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -112,6 +112,9 @@
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck" files=".*[/\\]samples[/\\].*\.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicyCheck" files=".*[/\\]samples[/\\].*\.java"/>
 
+  <!-- Don't apply custom Checkstyle rules to files under checkstyle package. -->
+  <suppress checks="com\.azure\.tools\.checkstyle\.checks\..+" files=".*[/\\]tools[/\\]checkstyle[/\\].*"/>
+
   <!-- JavaPackage suppression -->
   <suppress checks="JavadocPackage" files=".*[/\\]samples[/\\].*\.java"/>
 

From 2f1b77826184c5fae8d1c972e5fa49c5b12bf6f1 Mon Sep 17 00:00:00 2001
From: tg-msft <tg-msft@users.noreply.github.com>
Date: Thu, 15 Aug 2019 11:40:09 -0700
Subject: [PATCH 16/22] Update Storage swagger (#4981)

* Move Storage to official swagger files

There are no (meaningful) code changes except the attribute in
BlobHierarchyListSegment that I can't trace to the swagger

* Upgrade blobs swagger to 2019-02-02

Note that additional work will have to be done to patch our higher level code to
pass new parameters to existing APIs

* Fixes to Swagger generation and updating to use new protocol layer

* Fixed appendBlock content-type, added SpotBug exclusions for autogen code

* Update README.md

* Fixed incorrect exclude
---
 eng/.docsettings.yml                          |    3 +
 .../resources/spotbugs/spotbugs-exclude.xml   |    2 +
 .../storage/blob/AppendBlobAsyncClient.java   |   10 +-
 .../azure/storage/blob/BlobAsyncClient.java   |   14 +-
 .../storage/blob/BlockBlobAsyncClient.java    |   18 +-
 .../storage/blob/ContainerAsyncClient.java    |    2 +-
 .../storage/blob/PageBlobAsyncClient.java     |   10 +-
 .../blob/implementation/AppendBlobsImpl.java  |   77 +-
 .../AzureBlobStorageBuilder.java              |   44 +-
 .../implementation/AzureBlobStorageImpl.java  |   74 +-
 .../blob/implementation/BlobsImpl.java        |  368 +-
 .../blob/implementation/BlockBlobsImpl.java   |  126 +-
 .../blob/implementation/ContainersImpl.java   |   16 +-
 .../blob/implementation/DirectorysImpl.java   |  363 +
 .../blob/implementation/PageBlobsImpl.java    |   69 +-
 .../blob/implementation/ServicesImpl.java     |   42 +-
 .../blob/models/AccessTierOptional.java       |   47 +
 .../blob/models/AccessTierRequired.java       |   82 +
 .../AppendBlobAppendBlockFromUrlHeaders.java  |   34 +
 .../models/AppendBlobAppendBlockHeaders.java  |   97 +
 .../blob/models/AppendBlobCreateHeaders.java  |   62 +
 .../models/BlobAbortCopyFromURLHeaders.java   |   31 +
 .../blob/models/BlobAcquireLeaseHeaders.java  |   31 +
 .../blob/models/BlobBreakLeaseHeaders.java    |   31 +
 .../blob/models/BlobChangeLeaseHeaders.java   |   31 +
 .../blob/models/BlobCopyFromURLHeaders.java   |   31 +
 .../models/BlobCreateSnapshotHeaders.java     |   63 +
 .../blob/models/BlobDeleteHeaders.java        |   31 +
 .../blob/models/BlobDownloadHeaders.java      |  128 +
 .../models/BlobGetAccountInfoHeaders.java     |   31 +
 .../blob/models/BlobGetPropertiesHeaders.java |   89 +
 .../blob/models/BlobGetTagsHeaders.java       |  172 +
 .../azure/storage/blob/models/BlobItem.java   |   26 +
 .../storage/blob/models/BlobProperties.java   |   52 +
 .../blob/models/BlobReleaseLeaseHeaders.java  |   31 +
 .../blob/models/BlobRenameHeaders.java        |  234 +
 .../blob/models/BlobRenewLeaseHeaders.java    |   31 +
 .../models/BlobSetHTTPHeadersHeaders.java     |   31 +
 .../blob/models/BlobSetMetadataHeaders.java   |   63 +
 .../blob/models/BlobSetTagsHeaders.java       |  172 +
 .../blob/models/BlobSetTierHeaders.java       |   31 +
 .../models/BlobStartCopyFromURLHeaders.java   |   31 +
 .../azure/storage/blob/models/BlobTags.java   |   59 +
 .../blob/models/BlobUndeleteHeaders.java      |   31 +
 .../blob/models/BlobsGetTagsResponse.java     |   35 +
 .../blob/models/BlobsRenameResponse.java      |   27 +
 .../blob/models/BlobsSetTagsResponse.java     |   27 +
 .../BlockBlobCommitBlockListHeaders.java      |  116 +-
 .../models/BlockBlobGetBlockListHeaders.java  |   31 +
 .../BlockBlobStageBlockFromURLHeaders.java    |  117 +-
 .../models/BlockBlobStageBlockHeaders.java    |  117 +-
 .../blob/models/BlockBlobUploadHeaders.java   |   62 +
 .../models/ContainerAcquireLeaseHeaders.java  |   31 +
 .../models/ContainerBreakLeaseHeaders.java    |   31 +
 .../models/ContainerChangeLeaseHeaders.java   |   31 +
 .../blob/models/ContainerCreateHeaders.java   |   31 +
 .../blob/models/ContainerDeleteHeaders.java   |   31 +
 .../ContainerGetAccessPolicyHeaders.java      |   31 +
 .../ContainerGetAccountInfoHeaders.java       |   31 +
 .../models/ContainerGetPropertiesHeaders.java |   88 +
 .../ContainerListBlobFlatSegmentHeaders.java  |   31 +
 ...tainerListBlobHierarchySegmentHeaders.java |   31 +
 .../models/ContainerReleaseLeaseHeaders.java  |   31 +
 .../models/ContainerRenewLeaseHeaders.java    |   31 +
 .../ContainerSetAccessPolicyHeaders.java      |   31 +
 .../models/ContainerSetMetadataHeaders.java   |   31 +
 .../blob/models/CustomerProvidedKeyInfo.java  |   51 +
 .../blob/models/DataLakeStorageError.java     |   42 +
 .../models/DataLakeStorageErrorError.java     |   68 +
 .../models/DataLakeStorageErrorException.java |   39 +
 .../blob/models/DirectoryCreateHeaders.java   |  234 +
 .../blob/models/DirectoryDeleteHeaders.java   |  183 +
 .../blob/models/DirectoryHttpHeaders.java     |  149 +
 .../blob/models/DirectoryRenameHeaders.java   |  275 +
 .../blob/models/DirectorysCreateResponse.java |   27 +
 .../blob/models/DirectorysDeleteResponse.java |   27 +
 .../blob/models/DirectorysRenameResponse.java |   27 +
 .../storage/blob/models/FilterBlobsItem.java  |   94 +
 .../blob/models/FilterBlobsResponse.java      |  173 +
 .../blob/models/FilterBlobsSegment.java       |   44 +
 .../blob/models/ListBlobsIncludeItem.java     |    5 +
 .../models/PageBlobClearPagesHeaders.java     |   65 +
 .../PageBlobCopyIncrementalHeaders.java       |   31 +
 .../blob/models/PageBlobCreateHeaders.java    |   62 +
 .../PageBlobGetPageRangesDiffHeaders.java     |   31 +
 .../models/PageBlobGetPageRangesHeaders.java  |   31 +
 .../blob/models/PageBlobResizeHeaders.java    |   31 +
 .../PageBlobUpdateSequenceNumberHeaders.java  |   31 +
 .../PageBlobUploadPagesFromURLHeaders.java    |   34 +
 .../models/PageBlobUploadPagesHeaders.java    |   97 +
 .../storage/blob/models/PathRenameMode.java   |   55 +
 .../blob/models/RehydratePriority.java        |   42 +
 .../models/ServiceFilterBlobsHeaders.java     |  201 +
 .../models/ServiceGetAccountInfoHeaders.java  |   31 +
 .../models/ServiceGetPropertiesHeaders.java   |   31 +
 .../models/ServiceGetStatisticsHeaders.java   |   31 +
 .../ServiceGetUserDelegationKeyHeaders.java   |   31 +
 .../ServiceListContainersSegmentHeaders.java  |   31 +
 .../models/ServiceSetPropertiesHeaders.java   |   31 +
 .../models/ServicesFilterBlobsResponse.java   |   35 +
 .../storage/blob/models/StorageError.java     |   26 -
 .../storage/blob/models/StorageErrorCode.java |    5 -
 .../com/azure/storage/blob/models/Tag.java    |   68 +
 .../storage/blob/AppendBlobAPITest.groovy     |    2 +-
 .../storage/blob/BlockBlobAPITest.groovy      |    6 +-
 .../azure/storage/blob/PageBlobAPITest.groovy |    2 +-
 .../azure-storage-blob/swagger/README.md      |  870 ++
 .../swagger/blob-2018-11-09.json              | 8010 +++++++++++++
 .../swagger/blob-2019-02-02.json              | 9974 +++++++++++++++++
 .../azure-storage-blob/swagger/blob.json      | 8647 --------------
 .../AzureFileStorageBuilder.java              |    5 +-
 .../implementation/AzureFileStorageImpl.java  |    8 +-
 .../azure-storage-file/swagger/README.md      |  446 +
 .../{file.json => file-2018-11-09.json}       |  297 +-
 .../AzureQueueStorageBuilder.java             |    5 +-
 .../implementation/AzureQueueStorageImpl.java |    8 +-
 .../azure-storage-queue/swagger/README.md     |  175 +
 .../swagger/queue-2018-03-28.json             | 1856 +++
 .../azure-storage-queue/swagger/queue.json    | 1898 ----
 119 files changed, 27676 insertions(+), 11046 deletions(-)
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/DirectorysImpl.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetTagsHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenameHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTagsHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobTags.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsGetTagsResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsRenameResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsSetTagsResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/CustomerProvidedKeyInfo.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageError.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorError.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorException.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryCreateHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryDeleteHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryHttpHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryRenameHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysCreateResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysDeleteResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysRenameResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsItem.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsSegment.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PathRenameMode.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceFilterBlobsHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServicesFilterBlobsResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/Tag.java
 create mode 100644 sdk/storage/azure-storage-blob/swagger/README.md
 create mode 100644 sdk/storage/azure-storage-blob/swagger/blob-2018-11-09.json
 create mode 100644 sdk/storage/azure-storage-blob/swagger/blob-2019-02-02.json
 delete mode 100644 sdk/storage/azure-storage-blob/swagger/blob.json
 create mode 100644 sdk/storage/azure-storage-file/swagger/README.md
 rename sdk/storage/azure-storage-file/swagger/{file.json => file-2018-11-09.json} (95%)
 create mode 100644 sdk/storage/azure-storage-queue/swagger/README.md
 create mode 100644 sdk/storage/azure-storage-queue/swagger/queue-2018-03-28.json
 delete mode 100644 sdk/storage/azure-storage-queue/swagger/queue.json

diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
index 3ae4c9aa409d..4fb91b2a5c7e 100644
--- a/eng/.docsettings.yml
+++ b/eng/.docsettings.yml
@@ -75,6 +75,9 @@ known_content_issues:
   - ['sdk/cosmos/changelog/README.md', '#3113']
   - ['sdk/cosmos/microsoft-azure-cosmos-benchmark/README.md', '#3113']
   - ['sdk/cosmos/README.md', '#3113']
+  - ['sdk/storage/azure-storage-blob/swagger/README.md', '#3113']
+  - ['sdk/storage/azure-storage-queue/swagger/README.md', '#3113']
+  - ['sdk/storage/azure-storage-file/swagger/README.md', '#3113']
 package_indexing_exclusion_list:
   - azure-loganalytics-sample
   - azure-applicationinsights-query-sample
diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
index 6cfdbbd51923..bf64bafa0c43 100755
--- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
+++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -65,6 +65,8 @@
     <Or>
       <Class name="com.microsoft.azure.keyvault.authentication.KeyVaultCredentials"/>
       <Class name="com.azure.storage.blob.implementation.AzureBlobStorageBuilder"/>
+      <Class name="com.azure.storage.file.implementation.AzureFileStorageBuilder"/>
+      <Class name="com.azure.storage.queue.implementation.AzureQueueStorageBuilder"/>
     </Or>
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
   </Match>
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java
index 9cf6c224c0d3..d2d20d34c58f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/AppendBlobAsyncClient.java
@@ -94,8 +94,8 @@ public Mono<Response<AppendBlobItem>> create(BlobHTTPHeaders headers, Metadata m
         accessConditions = (accessConditions == null) ? new BlobAccessConditions() : accessConditions;
 
         return postProcessResponse(this.azureBlobStorage.appendBlobs().createWithRestResponseAsync(null,
-            null, 0, null, metadata, null, null,
-            null, null, headers, accessConditions.leaseAccessConditions(),
+            null, 0, null, metadata, null, null, null,
+            null, null, headers, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new AppendBlobItem(rb.deserializedHeaders())));
     }
@@ -144,10 +144,10 @@ public Mono<Response<AppendBlobItem>> appendBlock(Flux<ByteBuf> data, long lengt
             : appendBlobAccessConditions;
 
         return postProcessResponse(this.azureBlobStorage.appendBlobs().appendBlockWithRestResponseAsync(
-            null, null, data, length, null, null,
+            null, null, data, length, null, null, null,
             null, null, null, null,
             appendBlobAccessConditions.leaseAccessConditions(),
-            appendBlobAccessConditions.appendPositionAccessConditions(),
+            appendBlobAccessConditions.appendPositionAccessConditions(), null,
             appendBlobAccessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new AppendBlobItem(rb.deserializedHeaders())));
     }
@@ -201,7 +201,7 @@ public Mono<Response<AppendBlobItem>> appendBlockFromUrl(URL sourceURL, BlobRang
 
         return postProcessResponse(
             this.azureBlobStorage.appendBlobs().appendBlockFromUrlWithRestResponseAsync(null, null,
-                sourceURL, 0, sourceRange.toString(), sourceContentMD5, null, null,
+                sourceURL, 0, sourceRange.toString(), sourceContentMD5, null, null, null, null,
                 destAccessConditions.leaseAccessConditions(),
                 destAccessConditions.appendPositionAccessConditions(),
                 destAccessConditions.modifiedAccessConditions(), sourceAccessConditions, Context.NONE))
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
index b4a5e38668c6..53801a50018c 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
@@ -13,6 +13,7 @@
 import com.azure.storage.blob.implementation.AzureBlobStorageBuilder;
 import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
 import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.AccessTierRequired;
 import com.azure.storage.blob.models.BlobAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
 import com.azure.storage.blob.models.BlobRange;
@@ -245,7 +246,7 @@ public Mono<Response<String>> startCopyFromURL(URL sourceURL, Metadata metadata,
             .sourceIfNoneMatch(sourceModifiedAccessConditions.ifNoneMatch());
 
         return postProcessResponse(this.azureBlobStorage.blobs().startCopyFromURLWithRestResponseAsync(
-            null, null, sourceURL, null, metadata, null, sourceConditions,
+            null, null, sourceURL, null, metadata, null, null, null, null, sourceConditions,
             destAccessConditions.modifiedAccessConditions(), destAccessConditions.leaseAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, rb.deserializedHeaders().copyId()));
     }
@@ -340,7 +341,7 @@ public Mono<Response<String>> copyFromURL(URL copySource, Metadata metadata, Mod
             .sourceIfNoneMatch(sourceModifiedAccessConditions.ifNoneMatch());
 
         return postProcessResponse(this.azureBlobStorage.blobs().copyFromURLWithRestResponseAsync(
-            null, null, copySource, null, metadata, null, sourceConditions,
+            null, null, copySource, null, metadata, null, null, null, sourceConditions,
             destAccessConditions.modifiedAccessConditions(), destAccessConditions.leaseAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, rb.deserializedHeaders().copyId()));
     }
@@ -413,7 +414,7 @@ Mono<DownloadAsyncResponse> download(BlobRange range, BlobAccessConditions acces
         // TODO: range is BlobRange but expected as String
         // TODO: figure out correct response
         return postProcessResponse(this.azureBlobStorage.blobs().downloadWithRestResponseAsync(
-            null, null, snapshot, null, null, range.toHeaderValue(), getMD5,
+            null, null, snapshot, null, null, range.toHeaderValue(), getMD5, null,
             null, null, null, null,
             accessConditions.leaseAccessConditions(), accessConditions.modifiedAccessConditions(), Context.NONE))
             // Convert the autorest response to a DownloadAsyncResponse, which enable reliable download.
@@ -691,7 +692,7 @@ public Mono<VoidResponse> setMetadata(Metadata metadata, BlobAccessConditions ac
 
         return postProcessResponse(this.azureBlobStorage.blobs().setMetadataWithRestResponseAsync(
             null, null, null, metadata, null, null,
-            null, null, accessConditions.leaseAccessConditions(),
+            null, null, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(VoidResponse::new);
     }
@@ -734,7 +735,7 @@ public Mono<Response<BlobAsyncClient>> createSnapshot(Metadata metadata, BlobAcc
 
         return postProcessResponse(this.azureBlobStorage.blobs().createSnapshotWithRestResponseAsync(
             null, null, null, metadata, null, null,
-            null, null, accessConditions.modifiedAccessConditions(),
+            null, null, null, accessConditions.modifiedAccessConditions(),
             accessConditions.leaseAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, this.getSnapshotClient(rb.deserializedHeaders().snapshot())));
     }
@@ -779,9 +780,10 @@ public Mono<VoidResponse> setTier(AccessTier tier) {
      */
     public Mono<VoidResponse> setTier(AccessTier tier, LeaseAccessConditions leaseAccessConditions) {
         Utility.assertNotNull("tier", tier);
+        AccessTierRequired accessTierRequired = AccessTierRequired.fromString(tier.toString());
 
         return postProcessResponse(this.azureBlobStorage.blobs().setTierWithRestResponseAsync(
-            null, null, tier, null, null, leaseAccessConditions, Context.NONE))
+            null, null, accessTierRequired, null, null, null, leaseAccessConditions, Context.NONE))
             .map(VoidResponse::new);
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java
index 162bb1917b61..91875e7a2fd5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlockBlobAsyncClient.java
@@ -152,8 +152,8 @@ public Mono<Response<BlockBlobItem>> upload(Flux<ByteBuf> data, long length, Blo
         accessConditions = accessConditions == null ? new BlobAccessConditions() : accessConditions;
 
         return postProcessResponse(this.azureBlobStorage.blockBlobs().uploadWithRestResponseAsync(null,
-            null, data, length, null, metadata, null, null,
-            null, null, headers, accessConditions.leaseAccessConditions(),
+            null, data, length, null, metadata, null, null, null,
+            null, null, null, headers, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new BlockBlobItem(rb.deserializedHeaders())));
     }
@@ -297,8 +297,8 @@ public Mono<VoidResponse> stageBlock(String base64BlockID, Flux<ByteBuf> data,
     public Mono<VoidResponse> stageBlock(String base64BlockID, Flux<ByteBuf> data, long length,
                  LeaseAccessConditions leaseAccessConditions) {
         return postProcessResponse(this.azureBlobStorage.blockBlobs().stageBlockWithRestResponseAsync(null,
-            null, base64BlockID, length, data, null, null, null,
-            null, null, null, leaseAccessConditions, Context.NONE))
+            null, base64BlockID, length, data, null, null, null, null,
+            null, null, null, leaseAccessConditions, null, Context.NONE))
             .map(VoidResponse::new);
     }
 
@@ -359,9 +359,9 @@ public Mono<VoidResponse> stageBlockFromURL(String base64BlockID, URL sourceURL,
 
         return postProcessResponse(
             this.azureBlobStorage.blockBlobs().stageBlockFromURLWithRestResponseAsync(null, null,
-                base64BlockID, 0, sourceURL, sourceRange.toHeaderValue(), sourceContentMD5, null,
+                base64BlockID, 0, sourceURL, sourceRange.toHeaderValue(), sourceContentMD5, null, null,
                 null, null, null, null,
-                leaseAccessConditions, sourceModifiedAccessConditions, Context.NONE))
+                leaseAccessConditions, null, sourceModifiedAccessConditions, Context.NONE))
             .map(VoidResponse::new);
     }
 
@@ -456,9 +456,9 @@ public Mono<Response<BlockBlobItem>> commitBlockList(List<String> base64BlockIDs
         accessConditions = accessConditions == null ? new BlobAccessConditions() : accessConditions;
 
         return postProcessResponse(this.azureBlobStorage.blockBlobs().commitBlockListWithRestResponseAsync(
-            null, null, new BlockLookupList().latest(base64BlockIDs), null, metadata,
-            null, null, null, null, headers,
-            accessConditions.leaseAccessConditions(), accessConditions.modifiedAccessConditions(), Context.NONE))
+            null, null, new BlockLookupList().latest(base64BlockIDs), null, null, null, metadata, null,
+            null, null, null, null, null, headers,
+            accessConditions.leaseAccessConditions(), null, accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new BlockBlobItem(rb.deserializedHeaders())));
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java
index 99b1524507bf..a741b2c7dba2 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/ContainerAsyncClient.java
@@ -278,7 +278,7 @@ public Mono<VoidResponse> create(Metadata metadata, PublicAccessType accessType)
         metadata = metadata == null ? new Metadata() : metadata;
 
         return postProcessResponse(this.azureBlobStorage.containers().createWithRestResponseAsync(
-            null, null, metadata, accessType, null, Context.NONE))
+            null, null, metadata, accessType, null, null, null, Context.NONE))
             .map(VoidResponse::new);
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java
index 944bb4ef8ff6..57a98ebc22d1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/PageBlobAsyncClient.java
@@ -127,8 +127,8 @@ public Mono<Response<PageBlobItem>> create(long size, Long sequenceNumber, BlobH
         metadata = metadata == null ? new Metadata() : metadata;
 
         return postProcessResponse(this.azureBlobStorage.pageBlobs().createWithRestResponseAsync(null,
-            null, 0, size, null, metadata, null, null,
-            null, sequenceNumber, null, headers, accessConditions.leaseAccessConditions(),
+            null, 0, size, null, metadata, null, null, null,
+            null, sequenceNumber, null, headers, accessConditions.leaseAccessConditions(), null,
             accessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new PageBlobItem(rb.deserializedHeaders())));
     }
@@ -189,9 +189,9 @@ public Mono<Response<PageBlobItem>> uploadPages(PageRange pageRange, Flux<ByteBu
         String pageRangeStr = pageRangeToString(pageRange);
 
         return postProcessResponse(this.azureBlobStorage.pageBlobs().uploadPagesWithRestResponseAsync(null,
-            null, body, pageRange.end() - pageRange.start() + 1, null,
+            null, body, pageRange.end() - pageRange.start() + 1, null, null,
             null, pageRangeStr, null, null, null, null,
-            pageBlobAccessConditions.leaseAccessConditions(), pageBlobAccessConditions.sequenceNumberAccessConditions(),
+            pageBlobAccessConditions.leaseAccessConditions(), null, pageBlobAccessConditions.sequenceNumberAccessConditions(),
             pageBlobAccessConditions.modifiedAccessConditions(), Context.NONE))
             .map(rb -> new SimpleResponse<>(rb, new PageBlobItem(rb.deserializedHeaders())));
     }
@@ -272,7 +272,7 @@ public Mono<Response<PageBlobItem>> uploadPagesFromURL(PageRange range, URL sour
         destAccessConditions = destAccessConditions == null ? new PageBlobAccessConditions() : destAccessConditions;
 
         return postProcessResponse(this.azureBlobStorage.pageBlobs().uploadPagesFromURLWithRestResponseAsync(
-            null, null, sourceURL, sourceRangeString, 0, rangeString, sourceContentMD5,
+            null, null, sourceURL, sourceRangeString, 0, rangeString, sourceContentMD5, null,
             null, null, destAccessConditions.leaseAccessConditions(),
             destAccessConditions.sequenceNumberAccessConditions(), destAccessConditions.modifiedAccessConditions(),
             sourceAccessConditions, Context.NONE))
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
index 3439bb917017..9f220878e06d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
@@ -25,17 +25,19 @@
 import com.azure.storage.blob.models.AppendBlobsCreateResponse;
 import com.azure.storage.blob.models.AppendPositionAccessConditions;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import com.azure.storage.blob.models.StorageErrorException;
 import io.netty.buffer.ByteBuf;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import java.net.URL;
 import java.time.OffsetDateTime;
 import java.util.Map;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 /**
  * An instance of this class provides access to all the operations defined in
@@ -72,17 +74,17 @@ private interface AppendBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<AppendBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<AppendBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<AppendBlobsAppendBlockResponse> appendBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<AppendBlobsAppendBlockResponse> appendBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrl(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+        Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrl(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("x-ms-source-content-crc64") String sourceContentcrc64, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-blob-condition-maxsize") Long maxSize, @HeaderParam("x-ms-blob-condition-appendpos") Long appendPosition, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
     }
 
     /**
@@ -99,9 +101,10 @@ private interface AppendBlobsService {
     public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String blobType = "AppendBlob";
         final String blobContentType = null;
@@ -110,12 +113,13 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
         final String blobCacheControl = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -126,19 +130,21 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
      * @param contentLength The length of the request.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<AppendBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, Integer timeout, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String blobType = "AppendBlob";
         String blobContentType = null;
         if (blobHTTPHeaders != null) {
@@ -168,6 +174,10 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -187,7 +197,7 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -204,20 +214,22 @@ public Mono<AppendBlobsCreateResponse> createWithRestResponseAsync(String contai
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Context context) {
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "appendblock";
         final String leaseId = null;
         final Long maxSize = null;
         final Long appendPosition = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -229,19 +241,21 @@ public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(Str
      * @param contentLength The length of the request.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
      * @param appendPositionAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, byte[] transactionalContentMD5, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "appendblock";
         String leaseId = null;
         if (leaseAccessConditions != null) {
@@ -255,6 +269,10 @@ public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(Str
         if (appendPositionAccessConditions != null) {
             appendPosition = appendPositionAccessConditions.appendPosition();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -272,9 +290,10 @@ public Mono<AppendBlobsAppendBlockResponse> appendBlockWithRestResponseAsync(Str
             ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
         }
         String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.appendBlock(containerName, blob, this.client.getUrl(), body, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -302,11 +321,13 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
         String sourceContentMD5Converted = null;
+        String sourceContentcrc64Converted = null;
+        String transactionalContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
-        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, timeout, contentLength, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, contentLength, transactionalContentMD5Converted, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -318,7 +339,9 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
      * @param contentLength The length of the request.
      * @param sourceRange Bytes of source data in the specified range.
      * @param sourceContentMD5 Specify the md5 calculated for the range of bytes that must be read from the copy source.
+     * @param sourceContentcrc64 Specify the crc64 calculated for the range of bytes that must be read from the copy source.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
      * @param appendPositionAccessConditions Additional parameters for the operation.
@@ -329,7 +352,7 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestResponseAsync(String containerName, String blob, URL sourceUrl, long contentLength, String sourceRange, byte[] sourceContentMD5, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+    public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestResponseAsync(String containerName, String blob, URL sourceUrl, long contentLength, String sourceRange, byte[] sourceContentMD5, byte[] sourceContentcrc64, Integer timeout, byte[] transactionalContentMD5, String requestId, LeaseAccessConditions leaseAccessConditions, AppendPositionAccessConditions appendPositionAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
         final String comp = "appendblock";
         String leaseId = null;
         if (leaseAccessConditions != null) {
@@ -376,10 +399,12 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRestRes
             sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
         }
         String sourceContentMD5Converted = Base64Util.encodeToString(sourceContentMD5);
+        String sourceContentcrc64Converted = Base64Util.encodeToString(sourceContentcrc64);
+        String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
         DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
-        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, timeout, contentLength, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.appendBlockFromUrl(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, contentLength, transactionalContentMD5Converted, this.client.getVersion(), requestId, comp, leaseId, maxSize, appendPosition, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java
index fa28f6e26d0e..fe79309a238b 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageBuilder.java
@@ -7,6 +7,7 @@
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.implementation.RestProxy;
 import com.azure.core.implementation.annotation.ServiceClientBuilder;
+import com.azure.storage.blob.models.PathRenameMode;
 
 /**
  * A builder for creating a new instance of the AzureBlobStorage type.
@@ -45,6 +46,38 @@ public AzureBlobStorageBuilder version(String version) {
         return this;
     }
 
+    /*
+     * The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     */
+    private String filter;
+
+    /**
+     * Sets The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     *
+     * @param filter the filter value.
+     * @return the AzureBlobStorageBuilder.
+     */
+    public AzureBlobStorageBuilder filter(String filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /*
+     * Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'
+     */
+    private PathRenameMode pathRenameMode;
+
+    /**
+     * Sets Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     *
+     * @param pathRenameMode the pathRenameMode value.
+     * @return the AzureBlobStorageBuilder.
+     */
+    public AzureBlobStorageBuilder pathRenameMode(PathRenameMode pathRenameMode) {
+        this.pathRenameMode = pathRenameMode;
+        return this;
+    }
+
     /*
      * The HTTP pipeline to send requests through
      */
@@ -67,6 +100,9 @@ public AzureBlobStorageBuilder pipeline(HttpPipeline pipeline) {
      * @return an instance of AzureBlobStorageImpl.
      */
     public AzureBlobStorageImpl build() {
+        if (version == null) {
+            this.version = "2019-02-02";
+        }
         if (pipeline == null) {
             this.pipeline = RestProxy.createDefaultPipeline();
         }
@@ -76,8 +112,12 @@ public AzureBlobStorageImpl build() {
         }
         if (this.version != null) {
             client.setVersion(this.version);
-        } else {
-            client.setVersion("2018-11-09");
+        }
+        if (this.filter != null) {
+            client.setFilter(this.filter);
+        }
+        if (this.pathRenameMode != null) {
+            client.setPathRenameMode(this.pathRenameMode);
         }
         return client;
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java
index 5fc9bc8ae273..d9f48fbf8799 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImpl.java
@@ -6,6 +6,7 @@
 
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.implementation.RestProxy;
+import com.azure.storage.blob.models.PathRenameMode;
 
 /**
  * Initializes a new instance of the AzureBlobStorage type.
@@ -29,9 +30,11 @@ public String getUrl() {
      * Sets The URL of the service account, container, or blob that is the targe of the desired operation.
      *
      * @param url the url value.
+     * @return the service client itself.
      */
-    void setUrl(String url) {
+    AzureBlobStorageImpl setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     /**
@@ -52,9 +55,61 @@ public String getVersion() {
      * Sets Specifies the version of the operation to use for this request.
      *
      * @param version the version value.
+     * @return the service client itself.
      */
-    void setVersion(String version) {
+    AzureBlobStorageImpl setVersion(String version) {
         this.version = version;
+        return this;
+    }
+
+    /**
+     * The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     */
+    private String filter;
+
+    /**
+     * Gets The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     *
+     * @return the filter value.
+     */
+    public String getFilter() {
+        return this.filter;
+    }
+
+    /**
+     * Sets The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results.
+     *
+     * @param filter the filter value.
+     * @return the service client itself.
+     */
+    AzureBlobStorageImpl setFilter(String filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /**
+     * Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     */
+    private PathRenameMode pathRenameMode;
+
+    /**
+     * Gets Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     *
+     * @return the pathRenameMode value.
+     */
+    public PathRenameMode getPathRenameMode() {
+        return this.pathRenameMode;
+    }
+
+    /**
+     * Sets Determines the behavior of the rename operation. Possible values include: 'legacy', 'posix'.
+     *
+     * @param pathRenameMode the pathRenameMode value.
+     * @return the service client itself.
+     */
+    AzureBlobStorageImpl setPathRenameMode(PathRenameMode pathRenameMode) {
+        this.pathRenameMode = pathRenameMode;
+        return this;
     }
 
     /**
@@ -99,6 +154,20 @@ public ContainersImpl containers() {
         return this.containers;
     }
 
+    /**
+     * The DirectorysImpl object to access its operations.
+     */
+    private DirectorysImpl directorys;
+
+    /**
+     * Gets the DirectorysImpl object to access its operations.
+     *
+     * @return the DirectorysImpl object.
+     */
+    public DirectorysImpl directorys() {
+        return this.directorys;
+    }
+
     /**
      * The BlobsImpl object to access its operations.
      */
@@ -171,6 +240,7 @@ public AzureBlobStorageImpl(HttpPipeline httpPipeline) {
         this.httpPipeline = httpPipeline;
         this.services = new ServicesImpl(this);
         this.containers = new ContainersImpl(this);
+        this.directorys = new DirectorysImpl(this);
         this.blobs = new BlobsImpl(this);
         this.pageBlobs = new PageBlobsImpl(this);
         this.appendBlobs = new AppendBlobsImpl(this);
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
index eba1efa297e4..9f75f3503418 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
@@ -6,6 +6,7 @@
 
 import com.azure.core.implementation.DateTimeRfc1123;
 import com.azure.core.implementation.RestProxy;
+import com.azure.core.implementation.annotation.BodyParam;
 import com.azure.core.implementation.annotation.Delete;
 import com.azure.core.implementation.annotation.ExpectedResponses;
 import com.azure.core.implementation.annotation.Get;
@@ -22,7 +23,8 @@
 import com.azure.core.implementation.annotation.UnexpectedResponseExceptionType;
 import com.azure.core.implementation.util.Base64Util;
 import com.azure.core.util.Context;
-import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.AccessTierOptional;
+import com.azure.storage.blob.models.AccessTierRequired;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
 import com.azure.storage.blob.models.BlobsAbortCopyFromURLResponse;
 import com.azure.storage.blob.models.BlobsAcquireLeaseResponse;
@@ -34,17 +36,26 @@
 import com.azure.storage.blob.models.BlobsDownloadResponse;
 import com.azure.storage.blob.models.BlobsGetAccountInfoResponse;
 import com.azure.storage.blob.models.BlobsGetPropertiesResponse;
+import com.azure.storage.blob.models.BlobsGetTagsResponse;
 import com.azure.storage.blob.models.BlobsReleaseLeaseResponse;
+import com.azure.storage.blob.models.BlobsRenameResponse;
 import com.azure.storage.blob.models.BlobsRenewLeaseResponse;
 import com.azure.storage.blob.models.BlobsSetHTTPHeadersResponse;
 import com.azure.storage.blob.models.BlobsSetMetadataResponse;
+import com.azure.storage.blob.models.BlobsSetTagsResponse;
 import com.azure.storage.blob.models.BlobsSetTierResponse;
 import com.azure.storage.blob.models.BlobsStartCopyFromURLResponse;
 import com.azure.storage.blob.models.BlobsUndeleteResponse;
+import com.azure.storage.blob.models.BlobTags;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
+import com.azure.storage.blob.models.DataLakeStorageErrorException;
 import com.azure.storage.blob.models.DeleteSnapshotsOptionType;
+import com.azure.storage.blob.models.DirectoryHttpHeaders;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
+import com.azure.storage.blob.models.PathRenameMode;
+import com.azure.storage.blob.models.RehydratePriority;
 import com.azure.storage.blob.models.SourceModifiedAccessConditions;
 import com.azure.storage.blob.models.StorageErrorException;
 import java.net.URL;
@@ -87,18 +98,23 @@ private interface BlobsService {
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200, 206})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsDownloadResponse> download(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @HeaderParam("x-ms-range-get-content-md5") Boolean rangeGetContentMD5, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlobsDownloadResponse> download(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @HeaderParam("x-ms-range-get-content-md5") Boolean rangeGetContentMD5, @HeaderParam("x-ms-range-get-content-crc64") Boolean rangeGetContentCRC64, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Head("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsGetPropertiesResponse> getProperties(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlobsGetPropertiesResponse> getProperties(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Delete("{containerName}/{blob}")
         @ExpectedResponses({202})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
         Mono<BlobsDeleteResponse> delete(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-delete-snapshots") DeleteSnapshotsOptionType deleteSnapshots, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
+        @Put("{filesystem}/{path}")
+        @ExpectedResponses({201})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<BlobsRenameResponse> rename(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @QueryParam("mode") PathRenameMode pathRenameMode, @HeaderParam("x-ms-rename-source") String renameSource, @HeaderParam("x-ms-properties") String directoryProperties, @HeaderParam("x-ms-permissions") String posixPermissions, @HeaderParam("x-ms-umask") String posixUmask, @HeaderParam("x-ms-source-lease-id") String sourceLeaseId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-cache-control") String cacheControl, @HeaderParam("x-ms-content-type") String contentType, @HeaderParam("x-ms-content-encoding") String contentEncoding, @HeaderParam("x-ms-content-language") String contentLanguage, @HeaderParam("x-ms-content-disposition") String contentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+
         @Put("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
@@ -112,7 +128,7 @@ private interface BlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsSetMetadataResponse> setMetadata(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlobsSetMetadataResponse> setMetadata(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
@@ -142,17 +158,17 @@ private interface BlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsCreateSnapshotResponse> createSnapshot(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlobsCreateSnapshotResponse> createSnapshot(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({202})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsStartCopyFromURLResponse> startCopyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlobsStartCopyFromURLResponse> startCopyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @HeaderParam("x-ms-rehydrate-priority") RehydratePriority rehydratePriority, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({202})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsCopyFromURLResponse> copyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-requires-sync") String xMsRequiresSync, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlobsCopyFromURLResponse> copyFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-requires-sync") String xMsRequiresSync, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({204})
@@ -162,16 +178,26 @@ private interface BlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({200, 202})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlobsSetTierResponse> setTier(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-access-tier") AccessTier tier, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlobsSetTierResponse> setTier(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-access-tier") AccessTierRequired tier, @HeaderParam("x-ms-rehydrate-priority") RehydratePriority rehydratePriority, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
 
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
         Mono<BlobsGetAccountInfoResponse> getAccountInfo(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-version") String version, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
+
+        @Put("{containerName}/{blob}")
+        @ExpectedResponses({204})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<BlobsSetTagsResponse> setTags(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/xml; charset=utf-8") BlobTags tags, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
+
+        @Get("{containerName}/{blob}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<BlobsGetTagsResponse> getTags(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
     }
 
     /**
-     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.
+     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or version.
      *
      * @param containerName The container name.
      * @param blob The blob name.
@@ -186,20 +212,21 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
         final Integer timeout = null;
         final String range = null;
         final Boolean rangeGetContentMD5 = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final Boolean rangeGetContentCRC64 = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String leaseId = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, rangeGetContentCRC64, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
-     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.
+     * The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or version.
      *
      * @param containerName The container name.
      * @param blob The blob name.
@@ -208,9 +235,10 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param range Return only the bytes of the blob in the specified range.
      * @param rangeGetContentMD5 When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param rangeGetContentCRC64 When set to true and specified together with the Range, the service returns the CRC64 hash for the range, as long as the range is less than or equal to 4 MB in size.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -219,7 +247,7 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String range, Boolean rangeGetContentMD5, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String range, Boolean rangeGetContentMD5, Boolean rangeGetContentCRC64, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
@@ -242,7 +270,7 @@ public Mono<BlobsDownloadResponse> downloadWithRestResponseAsync(String containe
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.download(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, range, rangeGetContentMD5, rangeGetContentCRC64, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -259,16 +287,16 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
         final String snapshot = null;
         final String versionId = null;
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String leaseId = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -279,9 +307,9 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
      * @param snapshot The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob"&gt;Creating a Snapshot of a Blob.&lt;/a&gt;.
      * @param versionId The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -290,7 +318,7 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
@@ -313,7 +341,7 @@ public Mono<BlobsGetPropertiesResponse> getPropertiesWithRestResponseAsync(Strin
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.getProperties(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -383,6 +411,126 @@ public Mono<BlobsDeleteResponse> deleteWithRestResponseAsync(String containerNam
         return service.delete(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, deleteSnapshots, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
+    /**
+     * Rename a blob/file.  By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken.  This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @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<BlobsRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Context context) {
+        final Integer timeout = null;
+        final String directoryProperties = null;
+        final String posixPermissions = null;
+        final String posixUmask = null;
+        final String sourceLeaseId = null;
+        final String requestId = null;
+        final String cacheControl = null;
+        final String contentType = null;
+        final String contentEncoding = null;
+        final String contentLanguage = null;
+        final String contentDisposition = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        final String sourceIfMatch = null;
+        final String sourceIfNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
+    /**
+     * Rename a blob/file.  By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken.  This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param directoryProperties Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs "n1=v1, n2=v2, ...", where each value is base64 encoded.
+     * @param posixPermissions Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+     * @param posixUmask Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used.
+     * @param sourceLeaseId A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @param directoryHttpHeaders Additional parameters for the operation.
+     * @param leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @param sourceModifiedAccessConditions Additional parameters for the operation.
+     * @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<BlobsRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Integer timeout, String directoryProperties, String posixPermissions, String posixUmask, String sourceLeaseId, String requestId, DirectoryHttpHeaders directoryHttpHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+        String cacheControl = null;
+        if (directoryHttpHeaders != null) {
+            cacheControl = directoryHttpHeaders.cacheControl();
+        }
+        String contentType = null;
+        if (directoryHttpHeaders != null) {
+            contentType = directoryHttpHeaders.contentType();
+        }
+        String contentEncoding = null;
+        if (directoryHttpHeaders != null) {
+            contentEncoding = directoryHttpHeaders.contentEncoding();
+        }
+        String contentLanguage = null;
+        if (directoryHttpHeaders != null) {
+            contentLanguage = directoryHttpHeaders.contentLanguage();
+        }
+        String contentDisposition = null;
+        if (directoryHttpHeaders != null) {
+            contentDisposition = directoryHttpHeaders.contentDisposition();
+        }
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        OffsetDateTime sourceIfModifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
+        }
+        OffsetDateTime sourceIfUnmodifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfUnmodifiedSince = sourceModifiedAccessConditions.sourceIfUnmodifiedSince();
+        }
+        String sourceIfMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfMatch = sourceModifiedAccessConditions.sourceIfMatch();
+        }
+        String sourceIfNoneMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
     /**
      * Undelete a blob that was previously soft deleted.
      *
@@ -525,17 +673,18 @@ public Mono<BlobsSetHTTPHeadersResponse> setHTTPHeadersWithRestResponseAsync(Str
     public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String containerName, String blob, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "metadata";
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -545,23 +694,28 @@ public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String co
      * @param blob The blob name.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "metadata";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -580,7 +734,7 @@ public Mono<BlobsSetMetadataResponse> setMetadataWithRestResponseAsync(String co
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.setMetadata(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -905,17 +1059,18 @@ public Mono<BlobsBreakLeaseResponse> breakLeaseWithRestResponseAsync(String cont
     public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(String containerName, String blob, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "snapshot";
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         final String leaseId = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -925,10 +1080,11 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
      * @param blob The blob name.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
      * @param context The context to associate with this operation.
@@ -936,8 +1092,12 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(String containerName, String blob, Integer timeout, Map<String, String> metadata, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
         final String comp = "snapshot";
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -960,7 +1120,7 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
         }
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.createSnapshot(containerName, blob, this.client.getUrl(), timeout, metadata, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -977,6 +1137,9 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithRestResponseAsync(Str
     public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
+        final String tags = null;
+        final AccessTierOptional tier = null;
+        final RehydratePriority rehydratePriority = null;
         final String requestId = null;
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
@@ -987,7 +1150,7 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, rehydratePriority, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -998,6 +1161,9 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
      * @param copySource Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
+     * @param rehydratePriority Optional: Indicates the priority with which to rehydrate an archived blob. Possible values include: 'High', 'Standard'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param sourceModifiedAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -1007,7 +1173,7 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String tags, AccessTierOptional tier, RehydratePriority rehydratePriority, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
         OffsetDateTime sourceIfModifiedSince = null;
         if (sourceModifiedAccessConditions != null) {
             sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
@@ -1048,7 +1214,7 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.startCopyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, rehydratePriority, copySource, this.client.getVersion(), requestId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -1065,6 +1231,8 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithRestResponseAsync
     public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
+        final String tags = null;
+        final AccessTierOptional tier = null;
         final String requestId = null;
         final String xMsRequiresSync = "true";
         final String sourceIfMatch = null;
@@ -1076,7 +1244,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -1087,6 +1255,8 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
      * @param copySource Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param sourceModifiedAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
@@ -1096,7 +1266,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String containerName, String blob, URL copySource, Integer timeout, Map<String, String> metadata, String tags, AccessTierOptional tier, String requestId, SourceModifiedAccessConditions sourceModifiedAccessConditions, ModifiedAccessConditions modifiedAccessConditions, LeaseAccessConditions leaseAccessConditions, Context context) {
         final String xMsRequiresSync = "true";
         OffsetDateTime sourceIfModifiedSince = null;
         if (sourceModifiedAccessConditions != null) {
@@ -1138,7 +1308,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithRestResponseAsync(String co
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
+        return service.copyFromURL(containerName, blob, this.client.getUrl(), timeout, metadata, tags, tier, copySource, this.client.getVersion(), requestId, xMsRequiresSync, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, leaseId, context);
     }
 
     /**
@@ -1196,12 +1366,13 @@ public Mono<BlobsAbortCopyFromURLResponse> abortCopyFromURLWithRestResponseAsync
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTier tier, Context context) {
+    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTierRequired tier, Context context) {
         final Integer timeout = null;
+        final RehydratePriority rehydratePriority = null;
         final String requestId = null;
         final String comp = "tier";
         final String leaseId = null;
-        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, this.client.getVersion(), requestId, comp, leaseId, context);
+        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, rehydratePriority, this.client.getVersion(), requestId, comp, leaseId, context);
     }
 
     /**
@@ -1211,6 +1382,7 @@ public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerN
      * @param blob The blob name.
      * @param tier Indicates the tier to be set on the blob. Possible values include: 'P4', 'P6', 'P10', 'P20', 'P30', 'P40', 'P50', 'Hot', 'Cool', 'Archive'.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param rehydratePriority Optional: Indicates the priority with which to rehydrate an archived blob. Possible values include: 'High', 'Standard'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
      * @param context The context to associate with this operation.
@@ -1218,13 +1390,13 @@ public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerN
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTier tier, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlobsSetTierResponse> setTierWithRestResponseAsync(String containerName, String blob, AccessTierRequired tier, Integer timeout, RehydratePriority rehydratePriority, String requestId, LeaseAccessConditions leaseAccessConditions, Context context) {
         final String comp = "tier";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
-        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, this.client.getVersion(), requestId, comp, leaseId, context);
+        return service.setTier(containerName, blob, this.client.getUrl(), timeout, tier, rehydratePriority, this.client.getVersion(), requestId, comp, leaseId, context);
     }
 
     /**
@@ -1242,4 +1414,88 @@ public Mono<BlobsGetAccountInfoResponse> getAccountInfoWithRestResponseAsync(Str
         final String comp = "properties";
         return service.getAccountInfo(containerName, blob, this.client.getUrl(), this.client.getVersion(), restype, comp, context);
     }
+
+    /**
+     * The Set Blob Tags operation sets tags for the specified blob. This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param tags the BlobTags value.
+     * @param contentLength The length of the request.
+     * @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<BlobsSetTagsResponse> setTagsWithRestResponseAsync(String containerName, String blob, BlobTags tags, long contentLength, Context context) {
+        final Integer timeout = null;
+        final String requestId = null;
+        final String comp = "tags";
+        String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
+        return service.setTags(containerName, blob, this.client.getUrl(), tags, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Set Blob Tags operation sets tags for the specified blob. This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param tags the BlobTags value.
+     * @param contentLength The length of the request.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @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<BlobsSetTagsResponse> setTagsWithRestResponseAsync(String containerName, String blob, BlobTags tags, long contentLength, Integer timeout, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, String requestId, Context context) {
+        final String comp = "tags";
+        String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
+        return service.setTags(containerName, blob, this.client.getUrl(), tags, timeout, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Get Blob Tags operation returns all tags for the specified blob, snapshot, or version.  This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param contentLength The length of the request.
+     * @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<BlobsGetTagsResponse> getTagsWithRestResponseAsync(String containerName, String blob, long contentLength, Context context) {
+        final Integer timeout = null;
+        final String snapshot = null;
+        final String versionId = null;
+        final String requestId = null;
+        final String comp = "tags";
+        return service.getTags(containerName, blob, this.client.getUrl(), timeout, contentLength, snapshot, versionId, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Get Blob Tags operation returns all tags for the specified blob, snapshot, or version.  This API is only supported in version 2018-11-09 and later.
+     *
+     * @param containerName The container name.
+     * @param blob The blob name.
+     * @param contentLength The length of the request.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param snapshot The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob"&gt;Creating a Snapshot of a Blob.&lt;/a&gt;.
+     * @param versionId The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @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<BlobsGetTagsResponse> getTagsWithRestResponseAsync(String containerName, String blob, long contentLength, Integer timeout, String snapshot, String versionId, String requestId, Context context) {
+        final String comp = "tags";
+        return service.getTags(containerName, blob, this.client.getUrl(), timeout, contentLength, snapshot, versionId, this.client.getVersion(), requestId, comp, context);
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
index 390c2436de9a..ec226b60e1d8 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.implementation.annotation.UnexpectedResponseExceptionType;
 import com.azure.core.implementation.util.Base64Util;
 import com.azure.core.util.Context;
+import com.azure.storage.blob.models.AccessTierOptional;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
 import com.azure.storage.blob.models.BlockBlobsCommitBlockListResponse;
 import com.azure.storage.blob.models.BlockBlobsGetBlockListResponse;
@@ -29,6 +30,7 @@
 import com.azure.storage.blob.models.BlockBlobsUploadResponse;
 import com.azure.storage.blob.models.BlockListType;
 import com.azure.storage.blob.models.BlockLookupList;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
@@ -76,22 +78,22 @@ private interface BlockBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsUploadResponse> upload(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlockBlobsUploadResponse> upload(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsStageBlockResponse> stageBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, Context context);
+        Mono<BlockBlobsStageBlockResponse> stageBlock(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+        Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("blockid") String blockId, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("x-ms-source-content-crc64") String sourceContentcrc64, @QueryParam("timeout") Integer timeout, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<BlockBlobsCommitBlockListResponse> commitBlockList(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @BodyParam("application/xml; charset=utf-8") BlockLookupList blocks, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<BlockBlobsCommitBlockListResponse> commitBlockList(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-access-tier") AccessTierOptional tier, @BodyParam("application/xml; charset=utf-8") BlockLookupList blocks, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200})
@@ -114,9 +116,11 @@ private interface BlockBlobsService {
     public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
+        final AccessTierOptional tier = null;
         final String requestId = null;
         final String blobType = "BlockBlob";
         final String blobContentType = null;
@@ -125,12 +129,13 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
         final String blobCacheControl = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -142,19 +147,22 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
      * @param contentLength The length of the request.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Integer timeout, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, AccessTierOptional tier, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String blobType = "BlockBlob";
         String blobContentType = null;
         if (blobHTTPHeaders != null) {
@@ -184,6 +192,10 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -203,7 +215,7 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.upload(containerName, blob, this.client.getUrl(), body, timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -221,14 +233,16 @@ public Mono<BlockBlobsUploadResponse> uploadWithRestResponseAsync(String contain
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, Flux<ByteBuf> body, Context context) {
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "block";
         final String leaseId = null;
+        final String encryptionScope = null;
         String transactionalContentMD5Converted = null;
-        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, body, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, context);
+        String transactionalContentCrc64Converted = null;
+        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, body, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, context);
     }
 
     /**
@@ -240,25 +254,32 @@ public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String
      * @param contentLength The length of the request.
      * @param body Initial data.
      * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @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<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, Flux<ByteBuf> body, byte[] transactionalContentMD5, Integer timeout, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, Context context) {
+    public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, Flux<ByteBuf> body, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, Integer timeout, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, Context context) {
         final String comp = "block";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
-        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, body, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, context);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
+        return service.stageBlock(containerName, blob, this.client.getUrl(), blockId, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, body, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, context);
     }
 
     /**
@@ -277,18 +298,20 @@ public Mono<BlockBlobsStageBlockResponse> stageBlockWithRestResponseAsync(String
     public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, URL sourceUrl, Context context) {
         final String sourceRange = null;
         final Integer timeout = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "block";
         final String leaseId = null;
+        final String encryptionScope = null;
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
         String sourceContentMD5Converted = null;
+        String sourceContentcrc64Converted = null;
         DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
-        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -301,24 +324,30 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestRespon
      * @param sourceUrl Specify a URL to the copy source.
      * @param sourceRange Bytes of source data in the specified range.
      * @param sourceContentMD5 Specify the md5 calculated for the range of bytes that must be read from the copy source.
+     * @param sourceContentcrc64 Specify the crc64 calculated for the range of bytes that must be read from the copy source.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param sourceModifiedAccessConditions Additional parameters for the operation.
      * @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<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, URL sourceUrl, String sourceRange, byte[] sourceContentMD5, Integer timeout, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+    public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestResponseAsync(String containerName, String blob, String blockId, long contentLength, URL sourceUrl, String sourceRange, byte[] sourceContentMD5, byte[] sourceContentcrc64, Integer timeout, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
         final String comp = "block";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime sourceIfModifiedSince = null;
         if (sourceModifiedAccessConditions != null) {
             sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
@@ -336,9 +365,10 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestRespon
             sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
         }
         String sourceContentMD5Converted = Base64Util.encodeToString(sourceContentMD5);
+        String sourceContentcrc64Converted = Base64Util.encodeToString(sourceContentcrc64);
         DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
-        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, timeout, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.stageBlockFromURL(containerName, blob, this.client.getUrl(), blockId, contentLength, sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, timeout, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, leaseId, encryptionScope, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -355,9 +385,11 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithRestRespon
     public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAsync(String containerName, String blob, BlockLookupList blocks, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
+        final AccessTierOptional tier = null;
         final String requestId = null;
         final String comp = "blocklist";
         final String blobCacheControl = null;
@@ -366,12 +398,15 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
         final String blobContentLanguage = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
+        String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, transactionalContentMD5Converted, transactionalContentCrc64Converted, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -381,20 +416,25 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
      * @param blob The blob name.
      * @param blocks the BlockLookupList value.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tier Optional. Indicates the tier to be set on the blob. Possible values include: 'Hot', 'Cool', 'Archive'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAsync(String containerName, String blob, BlockLookupList blocks, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAsync(String containerName, String blob, BlockLookupList blocks, Integer timeout, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, AccessTierOptional tier, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "blocklist";
         String blobCacheControl = null;
         if (blobHTTPHeaders != null) {
@@ -424,6 +464,10 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -440,10 +484,12 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithRestResponseAs
         if (modifiedAccessConditions != null) {
             ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
         }
+        String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.commitBlockList(containerName, blob, this.client.getUrl(), timeout, transactionalContentMD5Converted, transactionalContentCrc64Converted, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, tier, blocks, this.client.getVersion(), requestId, comp, blobCacheControl, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java
index efb3b64cdf8b..5a594d600a85 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ContainersImpl.java
@@ -83,7 +83,7 @@ private interface ContainersService {
         @Put("{containerName}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ContainersCreateResponse> create(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-blob-public-access") PublicAccessType access, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, Context context);
+        Mono<ContainersCreateResponse> create(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-blob-public-access") PublicAccessType access, @HeaderParam("x-ms-default-encryption-scope") String defaultEncryptionScope, @HeaderParam("x-ms-deny-encryption-scope-override") Boolean denyEncryptionScopeOverride, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, Context context);
 
         @Get("{containerName}")
         @ExpectedResponses({200})
@@ -138,12 +138,12 @@ private interface ContainersService {
         @Get("{containerName}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ContainersListBlobFlatSegmentResponse> listBlobFlatSegment(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("marker") String marker, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") String include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
+        Mono<ContainersListBlobFlatSegmentResponse> listBlobFlatSegment(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("marker") String marker1, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") String include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
 
         @Get("{containerName}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ContainersListBlobHierarchySegmentResponse> listBlobHierarchySegment(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("delimiter") String delimiter, @QueryParam("marker") String marker, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") String include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
+        Mono<ContainersListBlobHierarchySegmentResponse> listBlobHierarchySegment(@PathParam("containerName") String containerName, @HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("delimiter") String delimiter, @QueryParam("marker") String marker1, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") String include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
 
         @Get("{containerName}")
         @ExpectedResponses({200})
@@ -164,9 +164,11 @@ public Mono<ContainersCreateResponse> createWithRestResponseAsync(String contain
         final Integer timeout = null;
         final Map<String, String> metadata = null;
         final PublicAccessType access = null;
+        final String defaultEncryptionScope = null;
+        final Boolean denyEncryptionScopeOverride = null;
         final String requestId = null;
         final String restype = "container";
-        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, this.client.getVersion(), requestId, restype, context);
+        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, defaultEncryptionScope, denyEncryptionScopeOverride, this.client.getVersion(), requestId, restype, context);
     }
 
     /**
@@ -176,15 +178,17 @@ public Mono<ContainersCreateResponse> createWithRestResponseAsync(String contain
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
      * @param access Specifies whether data in the container may be accessed publicly and the level of access. Possible values include: 'container', 'blob'.
+     * @param defaultEncryptionScope Optional. Specifies the default encryption scope on the container. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param denyEncryptionScopeOverride Optional. Specifies whether to deny encryption scope override provided in the request or not. If true, reject the request with encryption scope. If false, encryption is performed using encryption scope provided in the request. For more information, see Encryption at Rest for Azure Storage Services.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @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<ContainersCreateResponse> createWithRestResponseAsync(String containerName, Integer timeout, Map<String, String> metadata, PublicAccessType access, String requestId, Context context) {
+    public Mono<ContainersCreateResponse> createWithRestResponseAsync(String containerName, Integer timeout, Map<String, String> metadata, PublicAccessType access, String defaultEncryptionScope, Boolean denyEncryptionScopeOverride, String requestId, Context context) {
         final String restype = "container";
-        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, this.client.getVersion(), requestId, restype, context);
+        return service.create(containerName, this.client.getUrl(), timeout, metadata, access, defaultEncryptionScope, denyEncryptionScopeOverride, this.client.getVersion(), requestId, restype, context);
     }
 
     /**
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/DirectorysImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/DirectorysImpl.java
new file mode 100644
index 000000000000..1085a8ace909
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/DirectorysImpl.java
@@ -0,0 +1,363 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.RestProxy;
+import com.azure.core.implementation.annotation.Delete;
+import com.azure.core.implementation.annotation.ExpectedResponses;
+import com.azure.core.implementation.annotation.HeaderParam;
+import com.azure.core.implementation.annotation.Host;
+import com.azure.core.implementation.annotation.HostParam;
+import com.azure.core.implementation.annotation.PathParam;
+import com.azure.core.implementation.annotation.Put;
+import com.azure.core.implementation.annotation.QueryParam;
+import com.azure.core.implementation.annotation.ReturnType;
+import com.azure.core.implementation.annotation.ServiceInterface;
+import com.azure.core.implementation.annotation.ServiceMethod;
+import com.azure.core.implementation.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.util.Context;
+import com.azure.storage.blob.models.DataLakeStorageErrorException;
+import com.azure.storage.blob.models.DirectoryHttpHeaders;
+import com.azure.storage.blob.models.DirectorysCreateResponse;
+import com.azure.storage.blob.models.DirectorysDeleteResponse;
+import com.azure.storage.blob.models.DirectorysRenameResponse;
+import com.azure.storage.blob.models.LeaseAccessConditions;
+import com.azure.storage.blob.models.ModifiedAccessConditions;
+import com.azure.storage.blob.models.PathRenameMode;
+import com.azure.storage.blob.models.SourceModifiedAccessConditions;
+import java.time.OffsetDateTime;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in
+ * Directorys.
+ */
+public final class DirectorysImpl {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private DirectorysService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private AzureBlobStorageImpl client;
+
+    /**
+     * Initializes an instance of DirectorysImpl.
+     *
+     * @param client the instance of the service client containing this operation class.
+     */
+    public DirectorysImpl(AzureBlobStorageImpl client) {
+        this.service = RestProxy.create(DirectorysService.class, client.getHttpPipeline());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for AzureBlobStorageDirectorys
+     * to be used by the proxy service to perform REST calls.
+     */
+    @Host("{url}")
+    @ServiceInterface(name = "AzureBlobStorageDirectorys")
+    private interface DirectorysService {
+        @Put("{filesystem}/{path}")
+        @ExpectedResponses({201})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<DirectorysCreateResponse> create(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-properties") String directoryProperties, @HeaderParam("x-ms-permissions") String posixPermissions, @HeaderParam("x-ms-umask") String posixUmask, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("resource") String resource, @HeaderParam("x-ms-cache-control") String cacheControl, @HeaderParam("x-ms-content-type") String contentType, @HeaderParam("x-ms-content-encoding") String contentEncoding, @HeaderParam("x-ms-content-language") String contentLanguage, @HeaderParam("x-ms-content-disposition") String contentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+
+        @Put("{filesystem}/{path}")
+        @ExpectedResponses({201})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<DirectorysRenameResponse> rename(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @QueryParam("continuation") String marker, @QueryParam("mode") PathRenameMode pathRenameMode, @HeaderParam("x-ms-rename-source") String renameSource, @HeaderParam("x-ms-properties") String directoryProperties, @HeaderParam("x-ms-permissions") String posixPermissions, @HeaderParam("x-ms-umask") String posixUmask, @HeaderParam("x-ms-source-lease-id") String sourceLeaseId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-cache-control") String cacheControl, @HeaderParam("x-ms-content-type") String contentType, @HeaderParam("x-ms-content-encoding") String contentEncoding, @HeaderParam("x-ms-content-language") String contentLanguage, @HeaderParam("x-ms-content-disposition") String contentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+
+        @Delete("{filesystem}/{path}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(DataLakeStorageErrorException.class)
+        Mono<DirectorysDeleteResponse> delete(@PathParam("filesystem") String filesystem, @PathParam("path") String path, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @QueryParam("recursive") boolean recursiveDirectoryDelete, @QueryParam("continuation") String marker, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+    }
+
+    /**
+     * Create a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @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<DirectorysCreateResponse> createWithRestResponseAsync(String filesystem, String path, Context context) {
+        final Integer timeout = null;
+        final String directoryProperties = null;
+        final String posixPermissions = null;
+        final String posixUmask = null;
+        final String requestId = null;
+        final String resource = "directory";
+        final String cacheControl = null;
+        final String contentType = null;
+        final String contentEncoding = null;
+        final String contentLanguage = null;
+        final String contentDisposition = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        return service.create(filesystem, path, this.client.getUrl(), timeout, directoryProperties, posixPermissions, posixUmask, this.client.getVersion(), requestId, resource, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+
+    /**
+     * Create a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param directoryProperties Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs "n1=v1, n2=v2, ...", where each value is base64 encoded.
+     * @param posixPermissions Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+     * @param posixUmask Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @param directoryHttpHeaders Additional parameters for the operation.
+     * @param leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @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<DirectorysCreateResponse> createWithRestResponseAsync(String filesystem, String path, Integer timeout, String directoryProperties, String posixPermissions, String posixUmask, String requestId, DirectoryHttpHeaders directoryHttpHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+        final String resource = "directory";
+        String cacheControl = null;
+        if (directoryHttpHeaders != null) {
+            cacheControl = directoryHttpHeaders.cacheControl();
+        }
+        String contentType = null;
+        if (directoryHttpHeaders != null) {
+            contentType = directoryHttpHeaders.contentType();
+        }
+        String contentEncoding = null;
+        if (directoryHttpHeaders != null) {
+            contentEncoding = directoryHttpHeaders.contentEncoding();
+        }
+        String contentLanguage = null;
+        if (directoryHttpHeaders != null) {
+            contentLanguage = directoryHttpHeaders.contentLanguage();
+        }
+        String contentDisposition = null;
+        if (directoryHttpHeaders != null) {
+            contentDisposition = directoryHttpHeaders.contentDisposition();
+        }
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        return service.create(filesystem, path, this.client.getUrl(), timeout, directoryProperties, posixPermissions, posixUmask, this.client.getVersion(), requestId, resource, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+
+    /**
+     * Rename a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests. For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations). To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @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<DirectorysRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Context context) {
+        final Integer timeout = null;
+        final String marker = null;
+        final String directoryProperties = null;
+        final String posixPermissions = null;
+        final String posixUmask = null;
+        final String sourceLeaseId = null;
+        final String requestId = null;
+        final String cacheControl = null;
+        final String contentType = null;
+        final String contentEncoding = null;
+        final String contentLanguage = null;
+        final String contentDisposition = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        final String sourceIfMatch = null;
+        final String sourceIfNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, marker, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
+    /**
+     * Rename a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests. For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations). To fail if the destination already exists, use a conditional request with If-None-Match: "*".
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param renameSource The file or directory to be renamed. The value must have the following format: "/{filesysystem}/{path}".  If "x-ms-properties" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param marker When renaming a directory, the number of paths that are renamed with each invocation is limited.  If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header.  When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory.
+     * @param directoryProperties Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs "n1=v1, n2=v2, ...", where each value is base64 encoded.
+     * @param posixPermissions Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+     * @param posixUmask Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used.
+     * @param sourceLeaseId A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @param directoryHttpHeaders Additional parameters for the operation.
+     * @param leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @param sourceModifiedAccessConditions Additional parameters for the operation.
+     * @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<DirectorysRenameResponse> renameWithRestResponseAsync(String filesystem, String path, String renameSource, Integer timeout, String marker, String directoryProperties, String posixPermissions, String posixUmask, String sourceLeaseId, String requestId, DirectoryHttpHeaders directoryHttpHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+        String cacheControl = null;
+        if (directoryHttpHeaders != null) {
+            cacheControl = directoryHttpHeaders.cacheControl();
+        }
+        String contentType = null;
+        if (directoryHttpHeaders != null) {
+            contentType = directoryHttpHeaders.contentType();
+        }
+        String contentEncoding = null;
+        if (directoryHttpHeaders != null) {
+            contentEncoding = directoryHttpHeaders.contentEncoding();
+        }
+        String contentLanguage = null;
+        if (directoryHttpHeaders != null) {
+            contentLanguage = directoryHttpHeaders.contentLanguage();
+        }
+        String contentDisposition = null;
+        if (directoryHttpHeaders != null) {
+            contentDisposition = directoryHttpHeaders.contentDisposition();
+        }
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        OffsetDateTime sourceIfModifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfModifiedSince = sourceModifiedAccessConditions.sourceIfModifiedSince();
+        }
+        OffsetDateTime sourceIfUnmodifiedSince = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfUnmodifiedSince = sourceModifiedAccessConditions.sourceIfUnmodifiedSince();
+        }
+        String sourceIfMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfMatch = sourceModifiedAccessConditions.sourceIfMatch();
+        }
+        String sourceIfNoneMatch = null;
+        if (sourceModifiedAccessConditions != null) {
+            sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
+        DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
+        return service.rename(filesystem, path, this.client.getUrl(), timeout, marker, this.client.getPathRenameMode(), renameSource, directoryProperties, posixPermissions, posixUmask, sourceLeaseId, this.client.getVersion(), requestId, cacheControl, contentType, contentEncoding, contentLanguage, contentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+    }
+
+    /**
+     * Deletes the directory.
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param recursiveDirectoryDelete If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
+     * @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<DirectorysDeleteResponse> deleteWithRestResponseAsync(String filesystem, String path, boolean recursiveDirectoryDelete, Context context) {
+        final Integer timeout = null;
+        final String marker = null;
+        final String requestId = null;
+        final String leaseId = null;
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        DateTimeRfc1123 ifModifiedSinceConverted = null;
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
+        return service.delete(filesystem, path, this.client.getUrl(), timeout, recursiveDirectoryDelete, marker, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+
+    /**
+     * Deletes the directory.
+     *
+     * @param filesystem The filesystem name.
+     * @param path The namespace path to a file or directory.
+     * @param recursiveDirectoryDelete If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param marker When renaming a directory, the number of paths that are renamed with each invocation is limited.  If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header.  When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @param leaseAccessConditions Additional parameters for the operation.
+     * @param modifiedAccessConditions Additional parameters for the operation.
+     * @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<DirectorysDeleteResponse> deleteWithRestResponseAsync(String filesystem, String path, boolean recursiveDirectoryDelete, Integer timeout, String marker, String requestId, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+        String leaseId = null;
+        if (leaseAccessConditions != null) {
+            leaseId = leaseAccessConditions.leaseId();
+        }
+        OffsetDateTime ifModifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
+        }
+        OffsetDateTime ifUnmodifiedSince = null;
+        if (modifiedAccessConditions != null) {
+            ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
+        }
+        String ifMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifMatch = modifiedAccessConditions.ifMatch();
+        }
+        String ifNoneMatch = null;
+        if (modifiedAccessConditions != null) {
+            ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
+        }
+        DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
+        DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        return service.delete(filesystem, path, this.client.getUrl(), timeout, recursiveDirectoryDelete, marker, this.client.getVersion(), requestId, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
index 97dd44b22bc5..2b171b31339e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
@@ -22,6 +22,7 @@
 import com.azure.core.implementation.util.Base64Util;
 import com.azure.core.util.Context;
 import com.azure.storage.blob.models.BlobHTTPHeaders;
+import com.azure.storage.blob.models.CustomerProvidedKeyInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.LeaseAccessConditions;
 import com.azure.storage.blob.models.ModifiedAccessConditions;
@@ -80,12 +81,12 @@ private interface PageBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<PageBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-blob-content-length") long blobContentLength, @HeaderParam("x-ms-blob-sequence-number") Long blobSequenceNumber, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<PageBlobsCreateResponse> create(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("Content-Length") long contentLength, @HeaderParam("x-ms-meta-") Map<String, String> metadata, @HeaderParam("x-ms-tags") String tags, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-blob-content-length") long blobContentLength, @HeaderParam("x-ms-blob-sequence-number") Long blobSequenceNumber, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @HeaderParam("x-ms-blob-type") String blobType, @HeaderParam("x-ms-blob-content-type") String blobContentType, @HeaderParam("x-ms-blob-content-encoding") String blobContentEncoding, @HeaderParam("x-ms-blob-content-language") String blobContentLanguage, @HeaderParam("x-ms-blob-content-md5") String blobContentMD5, @HeaderParam("x-ms-blob-cache-control") String blobCacheControl, @HeaderParam("x-ms-blob-content-disposition") String blobContentDisposition, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<PageBlobsUploadPagesResponse> uploadPages(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @QueryParam("x-ms-encryption-key") String encryptionKey, @QueryParam("x-ms-encryption-key-sha256") String encryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType encryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
+        Mono<PageBlobsUploadPagesResponse> uploadPages(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @BodyParam("application/octet-stream") Flux<ByteBuf> body, @HeaderParam("Content-Length") long contentLength, @HeaderParam("Content-MD5") String transactionalContentMD5, @HeaderParam("x-ms-content-crc64") String transactionalContentCrc64, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @QueryParam("x-ms-encryption-key") String xMsEncryptionKey, @QueryParam("x-ms-encryption-key-sha256") String xMsEncryptionKeySha256, @QueryParam("x-ms-encryption-algorithm") EncryptionAlgorithmType xMsEncryptionAlgorithm, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @QueryParam("x-ms-encryption-scope") String encryptionScope, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, Context context);
 
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
@@ -95,7 +96,7 @@ private interface PageBlobsService {
         @Put("{containerName}/{blob}")
         @ExpectedResponses({201})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("Content-Length") long contentLength, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
+        Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURL(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-source-range") String sourceRange, @HeaderParam("x-ms-source-content-md5") String sourceContentMD5, @HeaderParam("x-ms-source-content-crc64") String sourceContentcrc64, @HeaderParam("Content-Length") long contentLength, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-range") String range, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, @HeaderParam("x-ms-page-write") String pageWrite, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-if-sequence-number-le") Long ifSequenceNumberLessThanOrEqualTo, @HeaderParam("x-ms-if-sequence-number-lt") Long ifSequenceNumberLessThan, @HeaderParam("x-ms-if-sequence-number-eq") Long ifSequenceNumberEqualTo, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatch, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, Context context);
 
         @Get("{containerName}/{blob}")
         @ExpectedResponses({200})
@@ -138,9 +139,10 @@ private interface PageBlobsService {
     public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, long blobContentLength, Context context) {
         final Integer timeout = null;
         final Map<String, String> metadata = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String tags = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final Long blobSequenceNumber = 0L;
         final String requestId = null;
         final String blobType = "PageBlob";
@@ -150,12 +152,13 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
         final String blobCacheControl = null;
         final String blobContentDisposition = null;
         final String leaseId = null;
+        final String encryptionScope = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String blobContentMD5Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -167,20 +170,22 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
      * @param blobContentLength This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param metadata Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param tags Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&amp;TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param blobSequenceNumber Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param blobHTTPHeaders Additional parameters for the operation.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @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<PageBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, long blobContentLength, Integer timeout, Map<String, String> metadata, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, Long blobSequenceNumber, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containerName, String blob, long contentLength, long blobContentLength, Integer timeout, Map<String, String> metadata, String tags, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, Long blobSequenceNumber, String requestId, BlobHTTPHeaders blobHTTPHeaders, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String blobType = "PageBlob";
         String blobContentType = null;
         if (blobHTTPHeaders != null) {
@@ -210,6 +215,10 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         OffsetDateTime ifModifiedSince = null;
         if (modifiedAccessConditions != null) {
             ifModifiedSince = modifiedAccessConditions.ifModifiedSince();
@@ -229,7 +238,7 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
         String blobContentMD5Converted = Base64Util.encodeToString(blobContentMD5);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, encryptionKey, encryptionKeySha256, encryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.create(containerName, blob, this.client.getUrl(), timeout, contentLength, metadata, tags, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, blobContentLength, blobSequenceNumber, this.client.getVersion(), requestId, blobType, blobContentType, blobContentEncoding, blobContentLanguage, blobContentMD5Converted, blobCacheControl, blobContentDisposition, leaseId, encryptionScope, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -247,22 +256,24 @@ public Mono<PageBlobsCreateResponse> createWithRestResponseAsync(String containe
     public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, Context context) {
         final Integer timeout = null;
         final String range = null;
-        final String encryptionKey = null;
-        final String encryptionKeySha256 = null;
-        final EncryptionAlgorithmType encryptionAlgorithm = null;
+        final String xMsEncryptionKey = null;
+        final String xMsEncryptionKeySha256 = null;
+        final EncryptionAlgorithmType xMsEncryptionAlgorithm = null;
         final String requestId = null;
         final String comp = "page";
         final String pageWrite = "update";
         final String leaseId = null;
+        final String encryptionScope = null;
         final Long ifSequenceNumberLessThanOrEqualTo = null;
         final Long ifSequenceNumberLessThan = null;
         final Long ifSequenceNumberEqualTo = null;
         final String ifMatch = null;
         final String ifNoneMatch = null;
         String transactionalContentMD5Converted = null;
+        String transactionalContentCrc64Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, timeout, range, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, timeout, range, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, encryptionScope, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -273,13 +284,15 @@ public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(Strin
      * @param body Initial data.
      * @param contentLength The length of the request.
      * @param transactionalContentMD5 Specify the transactional md5 for the body, to be validated by the service.
+     * @param transactionalContentCrc64 Specify the transactional crc64 for the body, to be validated by the service.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param range Return only the bytes of the blob in the specified range.
-     * @param encryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
-     * @param encryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
-     * @param encryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
+     * @param xMsEncryptionKey Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services.
+     * @param xMsEncryptionKeySha256 The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided.
+     * @param xMsEncryptionAlgorithm The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". Must be provided if the x-ms-encryption-key header is provided. Possible values include: 'AES256'.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
+     * @param customerProvidedKeyInfo Additional parameters for the operation.
      * @param sequenceNumberAccessConditions Additional parameters for the operation.
      * @param modifiedAccessConditions Additional parameters for the operation.
      * @param context The context to associate with this operation.
@@ -287,13 +300,17 @@ public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(Strin
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, byte[] transactionalContentMD5, Integer timeout, String range, String encryptionKey, String encryptionKeySha256, EncryptionAlgorithmType encryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
+    public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(String containerName, String blob, Flux<ByteBuf> body, long contentLength, byte[] transactionalContentMD5, byte[] transactionalContentCrc64, Integer timeout, String range, String xMsEncryptionKey, String xMsEncryptionKeySha256, EncryptionAlgorithmType xMsEncryptionAlgorithm, String requestId, LeaseAccessConditions leaseAccessConditions, CustomerProvidedKeyInfo customerProvidedKeyInfo, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, Context context) {
         final String comp = "page";
         final String pageWrite = "update";
         String leaseId = null;
         if (leaseAccessConditions != null) {
             leaseId = leaseAccessConditions.leaseId();
         }
+        String encryptionScope = null;
+        if (customerProvidedKeyInfo != null) {
+            encryptionScope = customerProvidedKeyInfo.encryptionScope();
+        }
         Long ifSequenceNumberLessThanOrEqualTo = null;
         if (sequenceNumberAccessConditions != null) {
             ifSequenceNumberLessThanOrEqualTo = sequenceNumberAccessConditions.ifSequenceNumberLessThanOrEqualTo();
@@ -323,9 +340,10 @@ public Mono<PageBlobsUploadPagesResponse> uploadPagesWithRestResponseAsync(Strin
             ifNoneMatch = modifiedAccessConditions.ifNoneMatch();
         }
         String transactionalContentMD5Converted = Base64Util.encodeToString(transactionalContentMD5);
+        String transactionalContentCrc64Converted = Base64Util.encodeToString(transactionalContentCrc64);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, timeout, range, encryptionKey, encryptionKeySha256, encryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
+        return service.uploadPages(containerName, blob, this.client.getUrl(), body, contentLength, transactionalContentMD5Converted, transactionalContentCrc64Converted, timeout, range, xMsEncryptionKey, xMsEncryptionKeySha256, xMsEncryptionAlgorithm, this.client.getVersion(), requestId, comp, pageWrite, leaseId, encryptionScope, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, context);
     }
 
     /**
@@ -441,11 +459,12 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
         final String sourceIfMatch = null;
         final String sourceIfNoneMatch = null;
         String sourceContentMD5Converted = null;
+        String sourceContentcrc64Converted = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfModifiedSinceConverted = null;
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = null;
-        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
@@ -458,6 +477,7 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
      * @param contentLength The length of the request.
      * @param range The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required.
      * @param sourceContentMD5 Specify the md5 calculated for the range of bytes that must be read from the copy source.
+     * @param sourceContentcrc64 Specify the crc64 calculated for the range of bytes that must be read from the copy source.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
      * @param leaseAccessConditions Additional parameters for the operation.
@@ -469,7 +489,7 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestResponseAsync(String containerName, String blob, URL sourceUrl, String sourceRange, long contentLength, String range, byte[] sourceContentMD5, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
+    public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestResponseAsync(String containerName, String blob, URL sourceUrl, String sourceRange, long contentLength, String range, byte[] sourceContentMD5, byte[] sourceContentcrc64, Integer timeout, String requestId, LeaseAccessConditions leaseAccessConditions, SequenceNumberAccessConditions sequenceNumberAccessConditions, ModifiedAccessConditions modifiedAccessConditions, SourceModifiedAccessConditions sourceModifiedAccessConditions, Context context) {
         final String comp = "page";
         final String pageWrite = "update";
         String leaseId = null;
@@ -521,11 +541,12 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithRestRespo
             sourceIfNoneMatch = sourceModifiedAccessConditions.sourceIfNoneMatch();
         }
         String sourceContentMD5Converted = Base64Util.encodeToString(sourceContentMD5);
+        String sourceContentcrc64Converted = Base64Util.encodeToString(sourceContentcrc64);
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
         DateTimeRfc1123 sourceIfModifiedSinceConverted = sourceIfModifiedSince == null ? null : new DateTimeRfc1123(sourceIfModifiedSince);
         DateTimeRfc1123 sourceIfUnmodifiedSinceConverted = sourceIfUnmodifiedSince == null ? null : new DateTimeRfc1123(sourceIfUnmodifiedSince);
-        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
+        return service.uploadPagesFromURL(containerName, blob, this.client.getUrl(), sourceUrl, sourceRange, sourceContentMD5Converted, sourceContentcrc64Converted, contentLength, timeout, range, this.client.getVersion(), requestId, comp, pageWrite, leaseId, ifSequenceNumberLessThanOrEqualTo, ifSequenceNumberLessThan, ifSequenceNumberEqualTo, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatch, sourceIfNoneMatch, context);
     }
 
     /**
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java
index 5d77ec9bcee0..c3cddbd66fa2 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.util.Context;
 import com.azure.storage.blob.models.KeyInfo;
 import com.azure.storage.blob.models.ListContainersIncludeType;
+import com.azure.storage.blob.models.ServicesFilterBlobsResponse;
 import com.azure.storage.blob.models.ServicesGetAccountInfoResponse;
 import com.azure.storage.blob.models.ServicesGetPropertiesResponse;
 import com.azure.storage.blob.models.ServicesGetStatisticsResponse;
@@ -81,7 +82,7 @@ private interface ServicesService {
         @Get("")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
-        Mono<ServicesListContainersSegmentResponse> listContainersSegment(@HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("marker") String marker, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") ListContainersIncludeType include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
+        Mono<ServicesListContainersSegmentResponse> listContainersSegment(@HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("marker") String marker1, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") ListContainersIncludeType include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
 
         @Post("")
         @ExpectedResponses({200})
@@ -92,6 +93,11 @@ private interface ServicesService {
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(StorageErrorException.class)
         Mono<ServicesGetAccountInfoResponse> getAccountInfo(@HostParam("url") String url, @HeaderParam("x-ms-version") String version, @QueryParam("restype") String restype, @QueryParam("comp") String comp, Context context);
+
+        @Get("")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<ServicesFilterBlobsResponse> filterBlobs(@HostParam("url") String url, @QueryParam("marker") String marker1, @QueryParam("maxresults") Integer maxresults, @QueryParam("filter") String filter, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp, Context context);
     }
 
     /**
@@ -277,4 +283,38 @@ public Mono<ServicesGetAccountInfoResponse> getAccountInfoWithRestResponseAsync(
         final String comp = "properties";
         return service.getAccountInfo(this.client.getUrl(), this.client.getVersion(), restype, comp, context);
     }
+
+    /**
+     * The Filter Blobs operation enables callers to list blobs in an account whose tags match a given search expression.
+     *
+     * @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<ServicesFilterBlobsResponse> filterBlobsWithRestResponseAsync(Context context) {
+        final String marker = null;
+        final Integer maxresults = null;
+        final Integer timeout = null;
+        final String requestId = null;
+        final String comp = "blobs";
+        return service.filterBlobs(this.client.getUrl(), marker, maxresults, this.client.getFilter(), timeout, this.client.getVersion(), requestId, comp, context);
+    }
+
+    /**
+     * The Filter Blobs operation enables callers to list blobs in an account whose tags match a given search expression.
+     *
+     * @param marker A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.
+     * @param maxresults Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled.
+     * @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<ServicesFilterBlobsResponse> filterBlobsWithRestResponseAsync(String marker, Integer maxresults, Integer timeout, String requestId, Context context) {
+        final String comp = "blobs";
+        return service.filterBlobs(this.client.getUrl(), marker, maxresults, this.client.getFilter(), timeout, this.client.getVersion(), requestId, comp, context);
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java
new file mode 100644
index 000000000000..55a3a7703d98
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/**
+ * Defines values for AccessTierOptional.
+ */
+public final class AccessTierOptional extends ExpandableStringEnum<AccessTierOptional> {
+    /**
+     * Static value Hot for AccessTierOptional.
+     */
+    public static final AccessTierOptional HOT = fromString("Hot");
+
+    /**
+     * Static value Cool for AccessTierOptional.
+     */
+    public static final AccessTierOptional COOL = fromString("Cool");
+
+    /**
+     * Static value Archive for AccessTierOptional.
+     */
+    public static final AccessTierOptional ARCHIVE = fromString("Archive");
+
+    /**
+     * Creates or finds a AccessTierOptional from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding AccessTierOptional.
+     */
+    @JsonCreator
+    public static AccessTierOptional fromString(String name) {
+        return fromString(name, AccessTierOptional.class);
+    }
+
+    /**
+     * @return known AccessTierOptional values.
+     */
+    public static Collection<AccessTierOptional> values() {
+        return values(AccessTierOptional.class);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java
new file mode 100644
index 000000000000..821302c1cd83
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java
@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/**
+ * Defines values for AccessTierRequired.
+ */
+public final class AccessTierRequired extends ExpandableStringEnum<AccessTierRequired> {
+    /**
+     * Static value P4 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P4 = fromString("P4");
+
+    /**
+     * Static value P6 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P6 = fromString("P6");
+
+    /**
+     * Static value P10 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P10 = fromString("P10");
+
+    /**
+     * Static value P20 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P20 = fromString("P20");
+
+    /**
+     * Static value P30 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P30 = fromString("P30");
+
+    /**
+     * Static value P40 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P40 = fromString("P40");
+
+    /**
+     * Static value P50 for AccessTierRequired.
+     */
+    public static final AccessTierRequired P50 = fromString("P50");
+
+    /**
+     * Static value Hot for AccessTierRequired.
+     */
+    public static final AccessTierRequired HOT = fromString("Hot");
+
+    /**
+     * Static value Cool for AccessTierRequired.
+     */
+    public static final AccessTierRequired COOL = fromString("Cool");
+
+    /**
+     * Static value Archive for AccessTierRequired.
+     */
+    public static final AccessTierRequired ARCHIVE = fromString("Archive");
+
+    /**
+     * Creates or finds a AccessTierRequired from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding AccessTierRequired.
+     */
+    @JsonCreator
+    public static AccessTierRequired fromString(String name) {
+        return fromString(name, AccessTierRequired.class);
+    }
+
+    /**
+     * @return known AccessTierRequired values.
+     */
+    public static Collection<AccessTierRequired> values() {
+        return values(AccessTierRequired.class);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java
index 8dcea49cd76c..509acba0c155 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockFromUrlHeaders.java
@@ -41,6 +41,14 @@ public final class AppendBlobAppendBlockFromUrlHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -164,6 +172,32 @@ public AppendBlobAppendBlockFromUrlHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the AppendBlobAppendBlockFromUrlHeaders object itself.
+     */
+    public AppendBlobAppendBlockFromUrlHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java
index a12cefa924e6..61d2450a114d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobAppendBlockHeaders.java
@@ -41,6 +41,21 @@ public final class AppendBlobAppendBlockHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -93,6 +108,14 @@ public final class AppendBlobAppendBlockHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the block. This header is only
+     * returned when the block was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -180,6 +203,56 @@ public AppendBlobAppendBlockHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the AppendBlobAppendBlockHeaders object itself.
+     */
+    public AppendBlobAppendBlockHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the AppendBlobAppendBlockHeaders object itself.
+     */
+    public AppendBlobAppendBlockHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -349,6 +422,30 @@ public AppendBlobAppendBlockHeaders encryptionKeySha256(String encryptionKeySha2
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the AppendBlobAppendBlockHeaders object itself.
+     */
+    public AppendBlobAppendBlockHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java
index c2e5a3e0929e..77af78187b8e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AppendBlobCreateHeaders.java
@@ -41,6 +41,13 @@ public final class AppendBlobCreateHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +94,13 @@ public final class AppendBlobCreateHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -174,6 +188,30 @@ public AppendBlobCreateHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the AppendBlobCreateHeaders object itself.
+     */
+    public AppendBlobCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +359,30 @@ public AppendBlobCreateHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the AppendBlobCreateHeaders object itself.
+     */
+    public AppendBlobCreateHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java
index c27f9fcac790..0dc5cbb43392 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAbortCopyFromURLHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-AbortCopyFromURL-Headers")
 @Fluent
 public final class BlobAbortCopyFromURLHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class BlobAbortCopyFromURLHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobAbortCopyFromURLHeaders object itself.
+     */
+    public BlobAbortCopyFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java
index d4649062bc60..0d986bc95d22 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobAcquireLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class BlobAcquireLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public BlobAcquireLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobAcquireLeaseHeaders object itself.
+     */
+    public BlobAcquireLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java
index 504b7201befe..ba1ba989e108 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobBreakLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class BlobBreakLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-time")
     private Integer leaseTime;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -145,6 +152,30 @@ public BlobBreakLeaseHeaders leaseTime(Integer leaseTime) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobBreakLeaseHeaders object itself.
+     */
+    public BlobBreakLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java
index 67d6971d9ff3..e8ffbec32efd 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobChangeLeaseHeaders.java
@@ -32,6 +32,13 @@ public final class BlobChangeLeaseHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -123,6 +130,30 @@ public BlobChangeLeaseHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobChangeLeaseHeaders object itself.
+     */
+    public BlobChangeLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java
index 140b771f8cd6..c584184a7a0c 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCopyFromURLHeaders.java
@@ -32,6 +32,13 @@ public final class BlobCopyFromURLHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -138,6 +145,30 @@ public BlobCopyFromURLHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobCopyFromURLHeaders object itself.
+     */
+    public BlobCopyFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java
index e27c4fde4964..7d4778cd49df 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobCreateSnapshotHeaders.java
@@ -39,6 +39,13 @@ public final class BlobCreateSnapshotHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -86,6 +93,14 @@ public final class BlobCreateSnapshotHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the source blob. This header is
+     * only returned when the blob was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -173,6 +188,30 @@ public BlobCreateSnapshotHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobCreateSnapshotHeaders object itself.
+     */
+    public BlobCreateSnapshotHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -324,6 +363,30 @@ public BlobCreateSnapshotHeaders encryptionKeySha256(String encryptionKeySha256)
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the source blob. This header is only returned when the blob was
+     * encrypted with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the source blob. This header is only returned when the blob was
+     * encrypted with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobCreateSnapshotHeaders object itself.
+     */
+    public BlobCreateSnapshotHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java
index 95e6289c3e40..0e4c48ffc536 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDeleteHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-Delete-Headers")
 @Fluent
 public final class BlobDeleteHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class BlobDeleteHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobDeleteHeaders object itself.
+     */
+    public BlobDeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
index 4e9e2997ebab..255b428f1e8e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
@@ -196,6 +196,13 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "x-ms-lease-status")
     private LeaseStatusType leaseStatus;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -248,6 +255,13 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * If the blob has a MD5 hash, and if request contains range header (Range
      * or x-ms-range), this response header is returned with the value of the
@@ -258,6 +272,22 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "x-ms-blob-content-md5")
     private byte[] blobContentMD5;
 
+    /*
+     * The number of tags corresponding to the blob.
+     */
+    @JsonProperty(value = "x-ms-tag-count")
+    private Integer tagCount;
+
+    /*
+     * If the request is to read a specified range and the
+     * x-ms-range-get-content-crc64 is set to true, then the request returns a
+     * crc64 for the range, as long as the range size is less than or equal to
+     * 4 MB. If both x-ms-range-get-content-crc64 & x-ms-range-get-content-md5
+     * is specified in the same request, it will fail with 400(Bad Request)
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] contentCrc64;
+
     /*
      * The errorCode property.
      */
@@ -824,6 +854,30 @@ public BlobDownloadHeaders leaseStatus(LeaseStatusType leaseStatus) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -995,6 +1049,30 @@ public BlobDownloadHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the blobContentMD5 property: If the blob has a MD5 hash, and if
      * request contains range header (Range or x-ms-range), this response
@@ -1023,6 +1101,56 @@ public BlobDownloadHeaders blobContentMD5(byte[] blobContentMD5) {
         return this;
     }
 
+    /**
+     * Get the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @return the tagCount value.
+     */
+    public Integer tagCount() {
+        return this.tagCount;
+    }
+
+    /**
+     * Set the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @param tagCount the tagCount value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders tagCount(Integer tagCount) {
+        this.tagCount = tagCount;
+        return this;
+    }
+
+    /**
+     * Get the contentCrc64 property: If the request is to read a specified
+     * range and the x-ms-range-get-content-crc64 is set to true, then the
+     * request returns a crc64 for the range, as long as the range size is less
+     * than or equal to 4 MB. If both x-ms-range-get-content-crc64 &amp;
+     * x-ms-range-get-content-md5 is specified in the same request, it will
+     * fail with 400(Bad Request).
+     *
+     * @return the contentCrc64 value.
+     */
+    public byte[] contentCrc64() {
+        return ImplUtils.clone(this.contentCrc64);
+    }
+
+    /**
+     * Set the contentCrc64 property: If the request is to read a specified
+     * range and the x-ms-range-get-content-crc64 is set to true, then the
+     * request returns a crc64 for the range, as long as the range size is less
+     * than or equal to 4 MB. If both x-ms-range-get-content-crc64 &amp;
+     * x-ms-range-get-content-md5 is specified in the same request, it will
+     * fail with 400(Bad Request).
+     *
+     * @param contentCrc64 the contentCrc64 value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders contentCrc64(byte[] contentCrc64) {
+        this.contentCrc64 = ImplUtils.clone(contentCrc64);
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java
index 21243aaac732..61acd7944cc9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetAccountInfoHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-GetAccountInfo-Headers")
 @Fluent
 public final class BlobGetAccountInfoHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -59,6 +66,30 @@ public final class BlobGetAccountInfoHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobGetAccountInfoHeaders object itself.
+     */
+    public BlobGetAccountInfoHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java
index 728ae5fd9e1e..a09003611a5f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetPropertiesHeaders.java
@@ -209,6 +209,13 @@ public final class BlobGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -261,6 +268,14 @@ public final class BlobGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the metadata. This header is only
+     * returned when the metadata was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The tier of page blob on a premium storage account or tier of block blob
      * on blob storage LRS accounts. For a list of allowed premium page blob
@@ -295,6 +310,12 @@ public final class BlobGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-access-tier-change-time")
     private DateTimeRfc1123 accessTierChangeTime;
 
+    /*
+     * The number of tags corresponding to the blob.
+     */
+    @JsonProperty(value = "x-ms-tag-count")
+    private Integer tagCount;
+
     /*
      * The errorCode property.
      */
@@ -914,6 +935,30 @@ public BlobGetPropertiesHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobGetPropertiesHeaders object itself.
+     */
+    public BlobGetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -1085,6 +1130,30 @@ public BlobGetPropertiesHeaders encryptionKeySha256(String encryptionKeySha256)
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the metadata was
+     * encrypted with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the metadata was
+     * encrypted with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobGetPropertiesHeaders object itself.
+     */
+    public BlobGetPropertiesHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the accessTier property: The tier of page blob on a premium storage
      * account or tier of block blob on blob storage LRS accounts. For a list
@@ -1198,6 +1267,26 @@ public BlobGetPropertiesHeaders accessTierChangeTime(OffsetDateTime accessTierCh
         return this;
     }
 
+    /**
+     * Get the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @return the tagCount value.
+     */
+    public Integer tagCount() {
+        return this.tagCount;
+    }
+
+    /**
+     * Set the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @param tagCount the tagCount value to set.
+     * @return the BlobGetPropertiesHeaders object itself.
+     */
+    public BlobGetPropertiesHeaders tagCount(Integer tagCount) {
+        this.tagCount = tagCount;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetTagsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetTagsHeaders.java
new file mode 100644
index 000000000000..62de1e897127
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobGetTagsHeaders.java
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for GetTags operation.
+ */
+@JacksonXmlRootElement(localName = "Blob-GetTags-Headers")
+@Fluent
+public final class BlobGetTagsHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * This header uniquely identifies the request that was made and can be
+     * used for troubleshooting the request.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * Indicates the version of the Blob service used to execute the request.
+     * This header is returned for requests made against version 2009-09-19 and
+     * above.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * UTC date/time value generated by the service that indicates the time at
+     * which the response was initiated
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /*
+     * The errorCode property.
+     */
+    @JsonProperty(value = "x-ms-error-code")
+    private String errorCode;
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @param requestId the requestId value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: Indicates the version of the Blob service used
+     * to execute the request. This header is returned for requests made
+     * against version 2009-09-19 and above.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: Indicates the version of the Blob service used
+     * to execute the request. This header is returned for requests made
+     * against version 2009-09-19 and above.
+     *
+     * @param version the version value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+
+    /**
+     * Get the errorCode property: The errorCode property.
+     *
+     * @return the errorCode value.
+     */
+    public String errorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * Set the errorCode property: The errorCode property.
+     *
+     * @param errorCode the errorCode value to set.
+     * @return the BlobGetTagsHeaders object itself.
+     */
+    public BlobGetTagsHeaders errorCode(String errorCode) {
+        this.errorCode = errorCode;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
index 3d777a4b2e38..41b8d278c7e4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
@@ -51,6 +51,12 @@ public final class BlobItem {
     @JsonProperty(value = "Metadata")
     private Map<String, String> metadata;
 
+    /*
+     * The tags property.
+     */
+    @JsonProperty(value = "Tags")
+    private BlobTags tags;
+
     /*
      * The isPrefix property.
      */
@@ -177,6 +183,26 @@ public BlobItem metadata(Map<String, String> metadata) {
         return this;
     }
 
+    /**
+     * Get the tags property: The tags property.
+     *
+     * @return the tags value.
+     */
+    public BlobTags tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: The tags property.
+     *
+     * @param tags the tags value to set.
+     * @return the BlobItem object itself.
+     */
+    public BlobItem tags(BlobTags tags) {
+        this.tags = tags;
+        return this;
+    }
+
     /**
      * Get the isPrefix property: The isPrefix property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
index d5bad7b9996e..0438f3f441f6 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
@@ -200,12 +200,24 @@ public final class BlobProperties {
     @JsonProperty(value = "CustomerProvidedKeySha256")
     private String customerProvidedKeySha256;
 
+    /*
+     * The encryptionScope property.
+     */
+    @JsonProperty(value = "EncryptionScope")
+    private String encryptionScope;
+
     /*
      * The accessTierChangeTime property.
      */
     @JsonProperty(value = "AccessTierChangeTime")
     private DateTimeRfc1123 accessTierChangeTime;
 
+    /*
+     * The number of tags corresponding to the blob.
+     */
+    @JsonProperty(value = "TagCount", required = true)
+    private int tagCount;
+
     /**
      * Get the creationTime property: The creationTime property.
      *
@@ -855,6 +867,26 @@ public BlobProperties customerProvidedKeySha256(String customerProvidedKeySha256
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryptionScope property.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryptionScope property.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobProperties object itself.
+     */
+    public BlobProperties encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the accessTierChangeTime property: The accessTierChangeTime
      * property.
@@ -883,4 +915,24 @@ public BlobProperties accessTierChangeTime(OffsetDateTime accessTierChangeTime)
         }
         return this;
     }
+
+    /**
+     * Get the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @return the tagCount value.
+     */
+    public int tagCount() {
+        return this.tagCount;
+    }
+
+    /**
+     * Set the tagCount property: The number of tags corresponding to the blob.
+     *
+     * @param tagCount the tagCount value to set.
+     * @return the BlobProperties object itself.
+     */
+    public BlobProperties tagCount(int tagCount) {
+        this.tagCount = tagCount;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java
index f503b9ab6d30..d90443f43ec1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobReleaseLeaseHeaders.java
@@ -32,6 +32,13 @@ public final class BlobReleaseLeaseHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public BlobReleaseLeaseHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobReleaseLeaseHeaders object itself.
+     */
+    public BlobReleaseLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenameHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenameHeaders.java
new file mode 100644
index 000000000000..7c293db887cd
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenameHeaders.java
@@ -0,0 +1,234 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Rename operation.
+ */
+@JacksonXmlRootElement(localName = "Blob-Rename-Headers")
+@Fluent
+public final class BlobRenameHeaders {
+    /*
+     * An HTTP entity tag associated with the file or directory.
+     */
+    @JsonProperty(value = "ETag")
+    private String eTag;
+
+    /*
+     * The data and time the file or directory was last modified.  Write
+     * operations on the file or directory update the last modified time.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * The size of the resource in bytes.
+     */
+    @JsonProperty(value = "Content-Length")
+    private Long contentLength;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @return the eTag value.
+     */
+    public String eTag() {
+        return this.eTag;
+    }
+
+    /**
+     * Set the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @param eTag the eTag value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders eTag(String eTag) {
+        this.eTag = eTag;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The data and time the file or directory
+     * was last modified.  Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime lastModified() {
+        if (this.lastModified == null) {
+            return null;
+        }
+        return this.lastModified.dateTime();
+    }
+
+    /**
+     * Set the lastModified property: The data and time the file or directory
+     * was last modified.  Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @param lastModified the lastModified value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders lastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
+        } else {
+            this.lastModified = new DateTimeRfc1123(lastModified);
+        }
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the contentLength property: The size of the resource in bytes.
+     *
+     * @return the contentLength value.
+     */
+    public Long contentLength() {
+        return this.contentLength;
+    }
+
+    /**
+     * Set the contentLength property: The size of the resource in bytes.
+     *
+     * @param contentLength the contentLength value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders contentLength(Long contentLength) {
+        this.contentLength = contentLength;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobRenameHeaders object itself.
+     */
+    public BlobRenameHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java
index 863157cf8a42..f7115f510628 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobRenewLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class BlobRenewLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public BlobRenewLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobRenewLeaseHeaders object itself.
+     */
+    public BlobRenewLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java
index ed539d644bc1..b926fb245980 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetHTTPHeadersHeaders.java
@@ -39,6 +39,13 @@ public final class BlobSetHTTPHeadersHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -146,6 +153,30 @@ public BlobSetHTTPHeadersHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetHTTPHeadersHeaders object itself.
+     */
+    public BlobSetHTTPHeadersHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java
index 5b3898194287..56704d9b8419 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetMetadataHeaders.java
@@ -32,6 +32,13 @@ public final class BlobSetMetadataHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -70,6 +77,14 @@ public final class BlobSetMetadataHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the metadata. This header is only
+     * returned when the when the metadata was with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -133,6 +148,30 @@ public BlobSetMetadataHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetMetadataHeaders object itself.
+     */
+    public BlobSetMetadataHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -256,6 +295,30 @@ public BlobSetMetadataHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the when the metadata
+     * was with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the metadata. This header is only returned when the when the metadata
+     * was with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlobSetMetadataHeaders object itself.
+     */
+    public BlobSetMetadataHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTagsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTagsHeaders.java
new file mode 100644
index 000000000000..58da7c6edbfb
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTagsHeaders.java
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for SetTags operation.
+ */
+@JacksonXmlRootElement(localName = "Blob-SetTags-Headers")
+@Fluent
+public final class BlobSetTagsHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * This header uniquely identifies the request that was made and can be
+     * used for troubleshooting the request.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * Indicates the version of the Blob service used to execute the request.
+     * This header is returned for requests made against version 2009-09-19 and
+     * above.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * UTC date/time value generated by the service that indicates the time at
+     * which the response was initiated
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /*
+     * The errorCode property.
+     */
+    @JsonProperty(value = "x-ms-error-code")
+    private String errorCode;
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @param requestId the requestId value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: Indicates the version of the Blob service used
+     * to execute the request. This header is returned for requests made
+     * against version 2009-09-19 and above.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: Indicates the version of the Blob service used
+     * to execute the request. This header is returned for requests made
+     * against version 2009-09-19 and above.
+     *
+     * @param version the version value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+
+    /**
+     * Get the errorCode property: The errorCode property.
+     *
+     * @return the errorCode value.
+     */
+    public String errorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * Set the errorCode property: The errorCode property.
+     *
+     * @param errorCode the errorCode value to set.
+     * @return the BlobSetTagsHeaders object itself.
+     */
+    public BlobSetTagsHeaders errorCode(String errorCode) {
+        this.errorCode = errorCode;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java
index 372b1a09ebc0..0ec7d69471c5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobSetTierHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Blob-SetTier-Headers")
 @Fluent
 public final class BlobSetTierHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class BlobSetTierHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobSetTierHeaders object itself.
+     */
+    public BlobSetTierHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java
index a6b195a6e6dc..f625c74b5250 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobStartCopyFromURLHeaders.java
@@ -32,6 +32,13 @@ public final class BlobStartCopyFromURLHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -140,6 +147,30 @@ public BlobStartCopyFromURLHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobStartCopyFromURLHeaders object itself.
+     */
+    public BlobStartCopyFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobTags.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobTags.java
new file mode 100644
index 000000000000..511b4202d2b6
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobTags.java
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * XML containing key/value pairs representing the tags for the blob.
+ */
+@JacksonXmlRootElement(localName = "Tags")
+@Fluent
+public final class BlobTags {
+    private static final class TagSetWrapper {
+        @JacksonXmlProperty(localName = "Tag")
+        private final List<Tag> items;
+
+        @JsonCreator
+        private TagSetWrapper(@JacksonXmlProperty(localName = "Tag") List<Tag> items) {
+            this.items = items;
+        }
+    }
+
+    /*
+     * The tagSet property.
+     */
+    @JsonProperty(value = "TagSet")
+    private TagSetWrapper tagSet;
+
+    /**
+     * Get the tagSet property: The tagSet property.
+     *
+     * @return the tagSet value.
+     */
+    public List<Tag> tagSet() {
+        if (this.tagSet == null) {
+            this.tagSet = new TagSetWrapper(new ArrayList<Tag>());
+        }
+        return this.tagSet.items;
+    }
+
+    /**
+     * Set the tagSet property: The tagSet property.
+     *
+     * @param tagSet the tagSet value to set.
+     * @return the BlobTags object itself.
+     */
+    public BlobTags tagSet(List<Tag> tagSet) {
+        this.tagSet = new TagSetWrapper(tagSet);
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java
index cd1ea6a55d13..3b11e7dd6632 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobUndeleteHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Blob-Undelete-Headers")
 @Fluent
 public final class BlobUndeleteHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class BlobUndeleteHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlobUndeleteHeaders object itself.
+     */
+    public BlobUndeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsGetTagsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsGetTagsResponse.java
new file mode 100644
index 000000000000..e97f1ca848f5
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsGetTagsResponse.java
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the getTags operation.
+ */
+public final class BlobsGetTagsResponse extends ResponseBase<BlobGetTagsHeaders, BlobTags> {
+    /**
+     * Creates an instance of BlobsGetTagsResponse.
+     *
+     * @param request the request which resulted in this BlobsGetTagsResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsGetTagsResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, BlobTags value, BlobGetTagsHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+
+    /**
+     * @return the deserialized response body.
+     */
+    @Override
+    public BlobTags value() {
+        return super.value();
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsRenameResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsRenameResponse.java
new file mode 100644
index 000000000000..1be4db789caa
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsRenameResponse.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the rename operation.
+ */
+public final class BlobsRenameResponse extends ResponseBase<BlobRenameHeaders, Void> {
+    /**
+     * Creates an instance of BlobsRenameResponse.
+     *
+     * @param request the request which resulted in this BlobsRenameResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsRenameResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, BlobRenameHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsSetTagsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsSetTagsResponse.java
new file mode 100644
index 000000000000..58946c96cbb3
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobsSetTagsResponse.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the setTags operation.
+ */
+public final class BlobsSetTagsResponse extends ResponseBase<BlobSetTagsHeaders, Void> {
+    /**
+     * Creates an instance of BlobsSetTagsResponse.
+     *
+     * @param request the request which resulted in this BlobsSetTagsResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsSetTagsResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, BlobSetTagsHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java
index 6bec949d7180..0b2f37e8bc76 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobCommitBlockListHeaders.java
@@ -34,13 +34,28 @@ public final class BlockBlobCommitBlockListHeaders {
     private DateTimeRfc1123 lastModified;
 
     /*
-     * If the blob has an MD5 hash and this operation is to read the full blob,
-     * this response header is returned so that the client can check for
-     * message content integrity.
+     * This header is returned so that the client can check for message content
+     * integrity. This header refers to the content of the request, meaning, in
+     * this case, the list of blocks, and not the content of the blob itself.
      */
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. This header refers to the content of the request, meaning, in
+     * this case, the list of blocks, and not the content of the blob itself.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +102,13 @@ public final class BlockBlobCommitBlockListHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -151,9 +173,10 @@ public BlockBlobCommitBlockListHeaders lastModified(OffsetDateTime lastModified)
     }
 
     /**
-     * Get the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Get the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. This header refers to the
+     * content of the request, meaning, in this case, the list of blocks, and
+     * not the content of the blob itself.
      *
      * @return the contentMD5 value.
      */
@@ -162,9 +185,10 @@ public byte[] contentMD5() {
     }
 
     /**
-     * Set the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Set the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. This header refers to the
+     * content of the request, meaning, in this case, the list of blocks, and
+     * not the content of the blob itself.
      *
      * @param contentMD5 the contentMD5 value to set.
      * @return the BlockBlobCommitBlockListHeaders object itself.
@@ -174,6 +198,56 @@ public BlockBlobCommitBlockListHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. This header refers to
+     * the content of the request, meaning, in this case, the list of blocks,
+     * and not the content of the blob itself.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. This header refers to
+     * the content of the request, meaning, in this case, the list of blocks,
+     * and not the content of the blob itself.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the BlockBlobCommitBlockListHeaders object itself.
+     */
+    public BlockBlobCommitBlockListHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobCommitBlockListHeaders object itself.
+     */
+    public BlockBlobCommitBlockListHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +395,30 @@ public BlockBlobCommitBlockListHeaders encryptionKeySha256(String encryptionKeyS
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobCommitBlockListHeaders object itself.
+     */
+    public BlockBlobCommitBlockListHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java
index fa50d846ebef..102d7229c0f1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobGetBlockListHeaders.java
@@ -45,6 +45,13 @@ public final class BlockBlobGetBlockListHeaders {
     @JsonProperty(value = "x-ms-blob-content-length")
     private Long blobContentLength;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -172,6 +179,30 @@ public BlockBlobGetBlockListHeaders blobContentLength(Long blobContentLength) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobGetBlockListHeaders object itself.
+     */
+    public BlockBlobGetBlockListHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java
index 88dd3c6346ed..bc26268bf092 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockFromURLHeaders.java
@@ -18,13 +18,28 @@
 @Fluent
 public final class BlockBlobStageBlockFromURLHeaders {
     /*
-     * If the blob has an MD5 hash and this operation is to read the full blob,
-     * this response header is returned so that the client can check for
-     * message content integrity.
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
      */
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -63,6 +78,14 @@ public final class BlockBlobStageBlockFromURLHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the block. This header is only
+     * returned when the block was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -70,9 +93,10 @@ public final class BlockBlobStageBlockFromURLHeaders {
     private String errorCode;
 
     /**
-     * Get the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Get the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @return the contentMD5 value.
      */
@@ -81,9 +105,10 @@ public byte[] contentMD5() {
     }
 
     /**
-     * Set the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Set the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @param contentMD5 the contentMD5 value to set.
      * @return the BlockBlobStageBlockFromURLHeaders object itself.
@@ -93,6 +118,56 @@ public BlockBlobStageBlockFromURLHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the BlockBlobStageBlockFromURLHeaders object itself.
+     */
+    public BlockBlobStageBlockFromURLHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobStageBlockFromURLHeaders object itself.
+     */
+    public BlockBlobStageBlockFromURLHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -216,6 +291,30 @@ public BlockBlobStageBlockFromURLHeaders encryptionKeySha256(String encryptionKe
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobStageBlockFromURLHeaders object itself.
+     */
+    public BlockBlobStageBlockFromURLHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java
index 56ffdfe93700..862aab9c267f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobStageBlockHeaders.java
@@ -18,13 +18,20 @@
 @Fluent
 public final class BlockBlobStageBlockHeaders {
     /*
-     * If the blob has an MD5 hash and this operation is to read the full blob,
-     * this response header is returned so that the client can check for
-     * message content integrity.
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
      */
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -47,6 +54,14 @@ public final class BlockBlobStageBlockHeaders {
     @JsonProperty(value = "Date")
     private DateTimeRfc1123 dateProperty;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The value of this header is set to true if the contents of the request
      * are successfully encrypted using the specified algorithm, and false
@@ -63,6 +78,14 @@ public final class BlockBlobStageBlockHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the block. This header is only
+     * returned when the block was encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -70,9 +93,10 @@ public final class BlockBlobStageBlockHeaders {
     private String errorCode;
 
     /**
-     * Get the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Get the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @return the contentMD5 value.
      */
@@ -81,9 +105,10 @@ public byte[] contentMD5() {
     }
 
     /**
-     * Set the contentMD5 property: If the blob has an MD5 hash and this
-     * operation is to read the full blob, this response header is returned so
-     * that the client can check for message content integrity.
+     * Set the contentMD5 property: This header is returned so that the client
+     * can check for message content integrity. The value of this header is
+     * computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
      *
      * @param contentMD5 the contentMD5 value to set.
      * @return the BlockBlobStageBlockHeaders object itself.
@@ -93,6 +118,30 @@ public BlockBlobStageBlockHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobStageBlockHeaders object itself.
+     */
+    public BlockBlobStageBlockHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -168,6 +217,32 @@ public BlockBlobStageBlockHeaders dateProperty(OffsetDateTime dateProperty) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the BlockBlobStageBlockHeaders object itself.
+     */
+    public BlockBlobStageBlockHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the isServerEncrypted property: The value of this header is set to
      * true if the contents of the request are successfully encrypted using the
@@ -216,6 +291,30 @@ public BlockBlobStageBlockHeaders encryptionKeySha256(String encryptionKeySha256
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the block. This header is only returned when the block was encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobStageBlockHeaders object itself.
+     */
+    public BlockBlobStageBlockHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java
index 76c59b2f74d9..feaaeecfd96a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlockBlobUploadHeaders.java
@@ -41,6 +41,13 @@ public final class BlockBlobUploadHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +94,13 @@ public final class BlockBlobUploadHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -174,6 +188,30 @@ public BlockBlobUploadHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the BlockBlobUploadHeaders object itself.
+     */
+    public BlockBlobUploadHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +359,30 @@ public BlockBlobUploadHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the BlockBlobUploadHeaders object itself.
+     */
+    public BlockBlobUploadHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java
index bd6d0580bdcf..15f4938ad8ee 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerAcquireLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerAcquireLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public ContainerAcquireLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerAcquireLeaseHeaders object itself.
+     */
+    public ContainerAcquireLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java
index 4df2a5f3ddef..bea7906493fb 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerBreakLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerBreakLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-time")
     private Integer leaseTime;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -145,6 +152,30 @@ public ContainerBreakLeaseHeaders leaseTime(Integer leaseTime) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerBreakLeaseHeaders object itself.
+     */
+    public ContainerBreakLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java
index 8c5371a5121f..dd16b934a42a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerChangeLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerChangeLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public ContainerChangeLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerChangeLeaseHeaders object itself.
+     */
+    public ContainerChangeLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java
index 9a22e560ca72..c52bf1b9a1e5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerCreateHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerCreateHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerCreateHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerCreateHeaders object itself.
+     */
+    public ContainerCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java
index 64af976e0367..4308de71d186 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerDeleteHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Container-Delete-Headers")
 @Fluent
 public final class ContainerDeleteHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class ContainerDeleteHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerDeleteHeaders object itself.
+     */
+    public ContainerDeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java
index a1a76b2f57ba..779ffb797e73 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccessPolicyHeaders.java
@@ -39,6 +39,13 @@ public final class ContainerGetAccessPolicyHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -148,6 +155,30 @@ public ContainerGetAccessPolicyHeaders lastModified(OffsetDateTime lastModified)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerGetAccessPolicyHeaders object itself.
+     */
+    public ContainerGetAccessPolicyHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java
index 692c4a71fc52..368acb2e4cc4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Container-GetAccountInfo-Headers")
 @Fluent
 public final class ContainerGetAccountInfoHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -59,6 +66,30 @@ public final class ContainerGetAccountInfoHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerGetAccountInfoHeaders object itself.
+     */
+    public ContainerGetAccountInfoHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java
index df2d12bbcdb6..85b8d6b73077 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerGetPropertiesHeaders.java
@@ -61,6 +61,13 @@ public final class ContainerGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-lease-status")
     private LeaseStatusType leaseStatus;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -90,6 +97,18 @@ public final class ContainerGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-blob-public-access")
     private PublicAccessType blobPublicAccess;
 
+    /*
+     * Default encryption scope on this container
+     */
+    @JsonProperty(value = "x-ms-default-encryption-scope")
+    private String defaultEncryptionScope;
+
+    /*
+     * Whether to reject the write request with encryption scope
+     */
+    @JsonProperty(value = "x-ms-deny-encryption-scope-override")
+    private Boolean denyEncryptionScopeOverride;
+
     /*
      * Indicates whether the container has an immutability policy set on it.
      */
@@ -253,6 +272,30 @@ public ContainerGetPropertiesHeaders leaseStatus(LeaseStatusType leaseStatus) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerGetPropertiesHeaders object itself.
+     */
+    public ContainerGetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -352,6 +395,51 @@ public ContainerGetPropertiesHeaders blobPublicAccess(PublicAccessType blobPubli
         return this;
     }
 
+    /**
+     * Get the defaultEncryptionScope property: Default encryption scope on
+     * this container.
+     *
+     * @return the defaultEncryptionScope value.
+     */
+    public String defaultEncryptionScope() {
+        return this.defaultEncryptionScope;
+    }
+
+    /**
+     * Set the defaultEncryptionScope property: Default encryption scope on
+     * this container.
+     *
+     * @param defaultEncryptionScope the defaultEncryptionScope value to set.
+     * @return the ContainerGetPropertiesHeaders object itself.
+     */
+    public ContainerGetPropertiesHeaders defaultEncryptionScope(String defaultEncryptionScope) {
+        this.defaultEncryptionScope = defaultEncryptionScope;
+        return this;
+    }
+
+    /**
+     * Get the denyEncryptionScopeOverride property: Whether to reject the
+     * write request with encryption scope.
+     *
+     * @return the denyEncryptionScopeOverride value.
+     */
+    public Boolean denyEncryptionScopeOverride() {
+        return this.denyEncryptionScopeOverride;
+    }
+
+    /**
+     * Set the denyEncryptionScopeOverride property: Whether to reject the
+     * write request with encryption scope.
+     *
+     * @param denyEncryptionScopeOverride the denyEncryptionScopeOverride value
+     * to set.
+     * @return the ContainerGetPropertiesHeaders object itself.
+     */
+    public ContainerGetPropertiesHeaders denyEncryptionScopeOverride(Boolean denyEncryptionScopeOverride) {
+        this.denyEncryptionScopeOverride = denyEncryptionScopeOverride;
+        return this;
+    }
+
     /**
      * Get the hasImmutabilityPolicy property: Indicates whether the container
      * has an immutability policy set on it.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java
index ef1252a5a8d4..a17ee04d84c1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobFlatSegmentHeaders.java
@@ -23,6 +23,13 @@ public final class ContainerListBlobFlatSegmentHeaders {
     @JsonProperty(value = "Content-Type")
     private String contentType;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -73,6 +80,30 @@ public ContainerListBlobFlatSegmentHeaders contentType(String contentType) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerListBlobFlatSegmentHeaders object itself.
+     */
+    public ContainerListBlobFlatSegmentHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java
index d1a671cf7550..44bf89808b3a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerListBlobHierarchySegmentHeaders.java
@@ -23,6 +23,13 @@ public final class ContainerListBlobHierarchySegmentHeaders {
     @JsonProperty(value = "Content-Type")
     private String contentType;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -73,6 +80,30 @@ public ContainerListBlobHierarchySegmentHeaders contentType(String contentType)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerListBlobHierarchySegmentHeaders object itself.
+     */
+    public ContainerListBlobHierarchySegmentHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java
index 7a8766ab2424..0a33b2b26cbc 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerReleaseLeaseHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerReleaseLeaseHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerReleaseLeaseHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerReleaseLeaseHeaders object itself.
+     */
+    public ContainerReleaseLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java
index a192e95a96c8..5fbbfb2a286b 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerRenewLeaseHeaders.java
@@ -38,6 +38,13 @@ public final class ContainerRenewLeaseHeaders {
     @JsonProperty(value = "x-ms-lease-id")
     private String leaseId;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public ContainerRenewLeaseHeaders leaseId(String leaseId) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerRenewLeaseHeaders object itself.
+     */
+    public ContainerRenewLeaseHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java
index 763e75291800..a38fbf929c42 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetAccessPolicyHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerSetAccessPolicyHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerSetAccessPolicyHeaders lastModified(OffsetDateTime lastModified)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerSetAccessPolicyHeaders object itself.
+     */
+    public ContainerSetAccessPolicyHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java
index e685322b83ff..ee483bfdde40 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ContainerSetMetadataHeaders.java
@@ -32,6 +32,13 @@ public final class ContainerSetMetadataHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -117,6 +124,30 @@ public ContainerSetMetadataHeaders lastModified(OffsetDateTime lastModified) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ContainerSetMetadataHeaders object itself.
+     */
+    public ContainerSetMetadataHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/CustomerProvidedKeyInfo.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/CustomerProvidedKeyInfo.java
new file mode 100644
index 000000000000..3c033adb0ccc
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/CustomerProvidedKeyInfo.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * Additional parameters for a set of operations.
+ */
+@JacksonXmlRootElement(localName = "customer-provided-key-info")
+@Fluent
+public final class CustomerProvidedKeyInfo {
+    /*
+     * Optional. Specifies the encryption scope to use to encrypt the data
+     * provided in the request. If not specified, encryption is performed with
+     * the root account encryption key.  For more information, see Encryption
+     * at Rest for Azure Storage Services.
+     */
+    @JsonProperty(value = "encryptionScope")
+    private String encryptionScope;
+
+    /**
+     * Get the encryptionScope property: Optional. Specifies the encryption
+     * scope to use to encrypt the data provided in the request. If not
+     * specified, encryption is performed with the root account encryption key.
+     * For more information, see Encryption at Rest for Azure Storage Services.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: Optional. Specifies the encryption
+     * scope to use to encrypt the data provided in the request. If not
+     * specified, encryption is performed with the root account encryption key.
+     * For more information, see Encryption at Rest for Azure Storage Services.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the CustomerProvidedKeyInfo object itself.
+     */
+    public CustomerProvidedKeyInfo encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageError.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageError.java
new file mode 100644
index 000000000000..d481a91fead8
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageError.java
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * The DataLakeStorageError model.
+ */
+@JacksonXmlRootElement(localName = "DataLakeStorageError")
+@Fluent
+public final class DataLakeStorageError {
+    /*
+     * The service error response object.
+     */
+    @JsonProperty(value = "error")
+    private DataLakeStorageErrorError error;
+
+    /**
+     * Get the error property: The service error response object.
+     *
+     * @return the error value.
+     */
+    public DataLakeStorageErrorError error() {
+        return this.error;
+    }
+
+    /**
+     * Set the error property: The service error response object.
+     *
+     * @param error the error value to set.
+     * @return the DataLakeStorageError object itself.
+     */
+    public DataLakeStorageError error(DataLakeStorageErrorError error) {
+        this.error = error;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorError.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorError.java
new file mode 100644
index 000000000000..b9c43856709c
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorError.java
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * The service error response object.
+ */
+@JacksonXmlRootElement(localName = "DataLakeStorageError_error")
+@Fluent
+public final class DataLakeStorageErrorError {
+    /*
+     * The service error code.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /*
+     * The service error message.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Get the code property: The service error code.
+     *
+     * @return the code value.
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Set the code property: The service error code.
+     *
+     * @param code the code value to set.
+     * @return the DataLakeStorageErrorError object itself.
+     */
+    public DataLakeStorageErrorError code(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get the message property: The service error message.
+     *
+     * @return the message value.
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set the message property: The service error message.
+     *
+     * @param message the message value to set.
+     * @return the DataLakeStorageErrorError object itself.
+     */
+    public DataLakeStorageErrorError message(String message) {
+        this.message = message;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorException.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorException.java
new file mode 100644
index 000000000000..da3d592a3e0d
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DataLakeStorageErrorException.java
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.exception.HttpResponseException;
+import com.azure.core.http.HttpResponse;
+
+/**
+ * Exception thrown for an invalid response with DataLakeStorageError information.
+ */
+public final class DataLakeStorageErrorException extends HttpResponseException {
+    /**
+     * Initializes a new instance of the DataLakeStorageErrorException class.
+     *
+     * @param message the exception message or the response content if a message is not available.
+     * @param response the HTTP response.
+     */
+    public DataLakeStorageErrorException(String message, HttpResponse response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the DataLakeStorageErrorException 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.
+     */
+    public DataLakeStorageErrorException(String message, HttpResponse response, DataLakeStorageError value) {
+        super(message, response, value);
+    }
+
+    @Override
+    public DataLakeStorageError value() {
+        return (DataLakeStorageError) super.value();
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryCreateHeaders.java
new file mode 100644
index 000000000000..fc9f5eeaf9d2
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryCreateHeaders.java
@@ -0,0 +1,234 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Create operation.
+ */
+@JacksonXmlRootElement(localName = "Directory-Create-Headers")
+@Fluent
+public final class DirectoryCreateHeaders {
+    /*
+     * An HTTP entity tag associated with the file or directory.
+     */
+    @JsonProperty(value = "ETag")
+    private String eTag;
+
+    /*
+     * The data and time the file or directory was last modified. Write
+     * operations on the file or directory update the last modified time.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * The size of the resource in bytes.
+     */
+    @JsonProperty(value = "Content-Length")
+    private Long contentLength;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @return the eTag value.
+     */
+    public String eTag() {
+        return this.eTag;
+    }
+
+    /**
+     * Set the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @param eTag the eTag value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders eTag(String eTag) {
+        this.eTag = eTag;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime lastModified() {
+        if (this.lastModified == null) {
+            return null;
+        }
+        return this.lastModified.dateTime();
+    }
+
+    /**
+     * Set the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @param lastModified the lastModified value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders lastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
+        } else {
+            this.lastModified = new DateTimeRfc1123(lastModified);
+        }
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the contentLength property: The size of the resource in bytes.
+     *
+     * @return the contentLength value.
+     */
+    public Long contentLength() {
+        return this.contentLength;
+    }
+
+    /**
+     * Set the contentLength property: The size of the resource in bytes.
+     *
+     * @param contentLength the contentLength value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders contentLength(Long contentLength) {
+        this.contentLength = contentLength;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the DirectoryCreateHeaders object itself.
+     */
+    public DirectoryCreateHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryDeleteHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryDeleteHeaders.java
new file mode 100644
index 000000000000..921df9072945
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryDeleteHeaders.java
@@ -0,0 +1,183 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Delete operation.
+ */
+@JacksonXmlRootElement(localName = "Directory-Delete-Headers")
+@Fluent
+public final class DirectoryDeleteHeaders {
+    /*
+     * When renaming a directory, the number of paths that are renamed with
+     * each invocation is limited. If the number of paths to be renamed exceeds
+     * this limit, a continuation token is returned in this response header.
+     * When a continuation token is returned in the response, it must be
+     * specified in a subsequent invocation of the rename operation to continue
+     * renaming the directory.
+     */
+    @JsonProperty(value = "x-ms-continuation")
+    private String marker;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @return the marker value.
+     */
+    public String marker() {
+        return this.marker;
+    }
+
+    /**
+     * Set the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @param marker the marker value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders marker(String marker) {
+        this.marker = marker;
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the DirectoryDeleteHeaders object itself.
+     */
+    public DirectoryDeleteHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryHttpHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryHttpHeaders.java
new file mode 100644
index 000000000000..ae0dd3997576
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryHttpHeaders.java
@@ -0,0 +1,149 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * Additional parameters for a set of operations, such as: Directorys_create,
+ * Directorys_rename, Blobs_rename.
+ */
+@JacksonXmlRootElement(localName = "directory-http-headers")
+@Fluent
+public final class DirectoryHttpHeaders {
+    /*
+     * Cache control for given resource
+     */
+    @JsonProperty(value = "cacheControl")
+    private String cacheControl;
+
+    /*
+     * Content type for given resource
+     */
+    @JsonProperty(value = "contentType")
+    private String contentType;
+
+    /*
+     * Content encoding for given resource
+     */
+    @JsonProperty(value = "contentEncoding")
+    private String contentEncoding;
+
+    /*
+     * Content language for given resource
+     */
+    @JsonProperty(value = "contentLanguage")
+    private String contentLanguage;
+
+    /*
+     * Content disposition for given resource
+     */
+    @JsonProperty(value = "contentDisposition")
+    private String contentDisposition;
+
+    /**
+     * Get the cacheControl property: Cache control for given resource.
+     *
+     * @return the cacheControl value.
+     */
+    public String cacheControl() {
+        return this.cacheControl;
+    }
+
+    /**
+     * Set the cacheControl property: Cache control for given resource.
+     *
+     * @param cacheControl the cacheControl value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders cacheControl(String cacheControl) {
+        this.cacheControl = cacheControl;
+        return this;
+    }
+
+    /**
+     * Get the contentType property: Content type for given resource.
+     *
+     * @return the contentType value.
+     */
+    public String contentType() {
+        return this.contentType;
+    }
+
+    /**
+     * Set the contentType property: Content type for given resource.
+     *
+     * @param contentType the contentType value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentType(String contentType) {
+        this.contentType = contentType;
+        return this;
+    }
+
+    /**
+     * Get the contentEncoding property: Content encoding for given resource.
+     *
+     * @return the contentEncoding value.
+     */
+    public String contentEncoding() {
+        return this.contentEncoding;
+    }
+
+    /**
+     * Set the contentEncoding property: Content encoding for given resource.
+     *
+     * @param contentEncoding the contentEncoding value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentEncoding(String contentEncoding) {
+        this.contentEncoding = contentEncoding;
+        return this;
+    }
+
+    /**
+     * Get the contentLanguage property: Content language for given resource.
+     *
+     * @return the contentLanguage value.
+     */
+    public String contentLanguage() {
+        return this.contentLanguage;
+    }
+
+    /**
+     * Set the contentLanguage property: Content language for given resource.
+     *
+     * @param contentLanguage the contentLanguage value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentLanguage(String contentLanguage) {
+        this.contentLanguage = contentLanguage;
+        return this;
+    }
+
+    /**
+     * Get the contentDisposition property: Content disposition for given
+     * resource.
+     *
+     * @return the contentDisposition value.
+     */
+    public String contentDisposition() {
+        return this.contentDisposition;
+    }
+
+    /**
+     * Set the contentDisposition property: Content disposition for given
+     * resource.
+     *
+     * @param contentDisposition the contentDisposition value to set.
+     * @return the DirectoryHttpHeaders object itself.
+     */
+    public DirectoryHttpHeaders contentDisposition(String contentDisposition) {
+        this.contentDisposition = contentDisposition;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryRenameHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryRenameHeaders.java
new file mode 100644
index 000000000000..365780542a9c
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectoryRenameHeaders.java
@@ -0,0 +1,275 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for Rename operation.
+ */
+@JacksonXmlRootElement(localName = "Directory-Rename-Headers")
+@Fluent
+public final class DirectoryRenameHeaders {
+    /*
+     * When renaming a directory, the number of paths that are renamed with
+     * each invocation is limited. If the number of paths to be renamed exceeds
+     * this limit, a continuation token is returned in this response header.
+     * When a continuation token is returned in the response, it must be
+     * specified in a subsequent invocation of the rename operation to continue
+     * renaming the directory.
+     */
+    @JsonProperty(value = "x-ms-continuation")
+    private String marker;
+
+    /*
+     * An HTTP entity tag associated with the file or directory.
+     */
+    @JsonProperty(value = "ETag")
+    private String eTag;
+
+    /*
+     * The data and time the file or directory was last modified. Write
+     * operations on the file or directory update the last modified time.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * A server-generated UUID recorded in the analytics logs for
+     * troubleshooting and correlation.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * The version of the REST protocol used to process the request.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * The size of the resource in bytes.
+     */
+    @JsonProperty(value = "Content-Length")
+    private Long contentLength;
+
+    /*
+     * A UTC date/time value generated by the service that indicates the time
+     * at which the response was initiated.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @return the marker value.
+     */
+    public String marker() {
+        return this.marker;
+    }
+
+    /**
+     * Set the marker property: When renaming a directory, the number of paths
+     * that are renamed with each invocation is limited. If the number of paths
+     * to be renamed exceeds this limit, a continuation token is returned in
+     * this response header. When a continuation token is returned in the
+     * response, it must be specified in a subsequent invocation of the rename
+     * operation to continue renaming the directory.
+     *
+     * @param marker the marker value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders marker(String marker) {
+        this.marker = marker;
+        return this;
+    }
+
+    /**
+     * Get the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @return the eTag value.
+     */
+    public String eTag() {
+        return this.eTag;
+    }
+
+    /**
+     * Set the eTag property: An HTTP entity tag associated with the file or
+     * directory.
+     *
+     * @param eTag the eTag value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders eTag(String eTag) {
+        this.eTag = eTag;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime lastModified() {
+        if (this.lastModified == null) {
+            return null;
+        }
+        return this.lastModified.dateTime();
+    }
+
+    /**
+     * Set the lastModified property: The data and time the file or directory
+     * was last modified. Write operations on the file or directory update the
+     * last modified time.
+     *
+     * @param lastModified the lastModified value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders lastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
+        } else {
+            this.lastModified = new DateTimeRfc1123(lastModified);
+        }
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: A server-generated UUID recorded in the
+     * analytics logs for troubleshooting and correlation.
+     *
+     * @param requestId the requestId value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of the REST protocol used to
+     * process the request.
+     *
+     * @param version the version value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the contentLength property: The size of the resource in bytes.
+     *
+     * @return the contentLength value.
+     */
+    public Long contentLength() {
+        return this.contentLength;
+    }
+
+    /**
+     * Set the contentLength property: The size of the resource in bytes.
+     *
+     * @param contentLength the contentLength value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders contentLength(Long contentLength) {
+        this.contentLength = contentLength;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: A UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the DirectoryRenameHeaders object itself.
+     */
+    public DirectoryRenameHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysCreateResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysCreateResponse.java
new file mode 100644
index 000000000000..884c526dda38
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysCreateResponse.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the create operation.
+ */
+public final class DirectorysCreateResponse extends ResponseBase<DirectoryCreateHeaders, Void> {
+    /**
+     * Creates an instance of DirectorysCreateResponse.
+     *
+     * @param request the request which resulted in this DirectorysCreateResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public DirectorysCreateResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, DirectoryCreateHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysDeleteResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysDeleteResponse.java
new file mode 100644
index 000000000000..6e3c9d532875
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysDeleteResponse.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the delete operation.
+ */
+public final class DirectorysDeleteResponse extends ResponseBase<DirectoryDeleteHeaders, Void> {
+    /**
+     * Creates an instance of DirectorysDeleteResponse.
+     *
+     * @param request the request which resulted in this DirectorysDeleteResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public DirectorysDeleteResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, DirectoryDeleteHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysRenameResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysRenameResponse.java
new file mode 100644
index 000000000000..afea46a8180b
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/DirectorysRenameResponse.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the rename operation.
+ */
+public final class DirectorysRenameResponse extends ResponseBase<DirectoryRenameHeaders, Void> {
+    /**
+     * Creates an instance of DirectorysRenameResponse.
+     *
+     * @param request the request which resulted in this DirectorysRenameResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public DirectorysRenameResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, DirectoryRenameHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsItem.java
new file mode 100644
index 000000000000..477c3efb3f87
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsItem.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.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * The FilterBlobsItem model.
+ */
+@JacksonXmlRootElement(localName = "Blob")
+@Fluent
+public final class FilterBlobsItem {
+    /*
+     * The name property.
+     */
+    @JsonProperty(value = "Name")
+    private String name;
+
+    /*
+     * The containerName property.
+     */
+    @JsonProperty(value = "ContainerName")
+    private String containerName;
+
+    /*
+     * The tagValue property.
+     */
+    @JsonProperty(value = "TagValue")
+    private String tagValue;
+
+    /**
+     * Get the name property: The name property.
+     *
+     * @return the name value.
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name property: The name property.
+     *
+     * @param name the name value to set.
+     * @return the FilterBlobsItem object itself.
+     */
+    public FilterBlobsItem name(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the containerName property: The containerName property.
+     *
+     * @return the containerName value.
+     */
+    public String containerName() {
+        return this.containerName;
+    }
+
+    /**
+     * Set the containerName property: The containerName property.
+     *
+     * @param containerName the containerName value to set.
+     * @return the FilterBlobsItem object itself.
+     */
+    public FilterBlobsItem containerName(String containerName) {
+        this.containerName = containerName;
+        return this;
+    }
+
+    /**
+     * Get the tagValue property: The tagValue property.
+     *
+     * @return the tagValue value.
+     */
+    public String tagValue() {
+        return this.tagValue;
+    }
+
+    /**
+     * Set the tagValue property: The tagValue property.
+     *
+     * @param tagValue the tagValue value to set.
+     * @return the FilterBlobsItem object itself.
+     */
+    public FilterBlobsItem tagValue(String tagValue) {
+        this.tagValue = tagValue;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsResponse.java
new file mode 100644
index 000000000000..df691b96b781
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsResponse.java
@@ -0,0 +1,173 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * An enumeration of blobs which matched the filter.
+ */
+@JacksonXmlRootElement(localName = "EnumerationResults")
+@Fluent
+public final class FilterBlobsResponse {
+    /*
+     * The serviceEndpoint property.
+     */
+    @JacksonXmlProperty(localName = "ServiceEndpoint", isAttribute = true)
+    private String serviceEndpoint;
+
+    /*
+     * The filter property.
+     */
+    @JsonProperty(value = "Filter", required = true)
+    private String filter;
+
+    /*
+     * The marker property.
+     */
+    @JsonProperty(value = "Marker")
+    private String marker;
+
+    /*
+     * The maxResults property.
+     */
+    @JsonProperty(value = "MaxResults")
+    private Integer maxResults;
+
+    /*
+     * The segment property.
+     */
+    @JsonProperty(value = "Blobs", required = true)
+    private FilterBlobsSegment segment;
+
+    /*
+     * The nextMarker property.
+     */
+    @JsonProperty(value = "NextMarker", required = true)
+    private String nextMarker;
+
+    /**
+     * Get the serviceEndpoint property: The serviceEndpoint property.
+     *
+     * @return the serviceEndpoint value.
+     */
+    public String serviceEndpoint() {
+        return this.serviceEndpoint;
+    }
+
+    /**
+     * Set the serviceEndpoint property: The serviceEndpoint property.
+     *
+     * @param serviceEndpoint the serviceEndpoint value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse serviceEndpoint(String serviceEndpoint) {
+        this.serviceEndpoint = serviceEndpoint;
+        return this;
+    }
+
+    /**
+     * Get the filter property: The filter property.
+     *
+     * @return the filter value.
+     */
+    public String filter() {
+        return this.filter;
+    }
+
+    /**
+     * Set the filter property: The filter property.
+     *
+     * @param filter the filter value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse filter(String filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /**
+     * Get the marker property: The marker property.
+     *
+     * @return the marker value.
+     */
+    public String marker() {
+        return this.marker;
+    }
+
+    /**
+     * Set the marker property: The marker property.
+     *
+     * @param marker the marker value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse marker(String marker) {
+        this.marker = marker;
+        return this;
+    }
+
+    /**
+     * Get the maxResults property: The maxResults property.
+     *
+     * @return the maxResults value.
+     */
+    public Integer maxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * Set the maxResults property: The maxResults property.
+     *
+     * @param maxResults the maxResults value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse maxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+        return this;
+    }
+
+    /**
+     * Get the segment property: The segment property.
+     *
+     * @return the segment value.
+     */
+    public FilterBlobsSegment segment() {
+        return this.segment;
+    }
+
+    /**
+     * Set the segment property: The segment property.
+     *
+     * @param segment the segment value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse segment(FilterBlobsSegment segment) {
+        this.segment = segment;
+        return this;
+    }
+
+    /**
+     * Get the nextMarker property: The nextMarker property.
+     *
+     * @return the nextMarker value.
+     */
+    public String nextMarker() {
+        return this.nextMarker;
+    }
+
+    /**
+     * Set the nextMarker property: The nextMarker property.
+     *
+     * @param nextMarker the nextMarker value to set.
+     * @return the FilterBlobsResponse object itself.
+     */
+    public FilterBlobsResponse nextMarker(String nextMarker) {
+        this.nextMarker = nextMarker;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsSegment.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsSegment.java
new file mode 100644
index 000000000000..c4daa8b128f6
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/FilterBlobsSegment.java
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The FilterBlobsSegment model.
+ */
+@JacksonXmlRootElement(localName = "Blobs")
+@Fluent
+public final class FilterBlobsSegment {
+    /*
+     * The blobItems property.
+     */
+    @JsonProperty("Blob")
+    private List<FilterBlobsItem> blobItems = new ArrayList<>();
+
+    /**
+     * Get the blobItems property: The blobItems property.
+     *
+     * @return the blobItems value.
+     */
+    public List<FilterBlobsItem> blobItems() {
+        return this.blobItems;
+    }
+
+    /**
+     * Set the blobItems property: The blobItems property.
+     *
+     * @param blobItems the blobItems value to set.
+     * @return the FilterBlobsSegment object itself.
+     */
+    public FilterBlobsSegment blobItems(List<FilterBlobsItem> blobItems) {
+        this.blobItems = blobItems;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
index 47ed4cbfd72f..6da8de210231 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
@@ -31,6 +31,11 @@ public enum ListBlobsIncludeItem {
      */
     SNAPSHOTS("snapshots"),
 
+    /**
+     * Enum value tags.
+     */
+    TAGS("tags"),
+
     /**
      * Enum value uncommittedblobs.
      */
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java
index 543c829bf271..c5c125eda749 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobClearPagesHeaders.java
@@ -41,12 +41,27 @@ public final class PageBlobClearPagesHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The current sequence number for the page blob.
      */
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -156,6 +171,32 @@ public PageBlobClearPagesHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the PageBlobClearPagesHeaders object itself.
+     */
+    public PageBlobClearPagesHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the blobSequenceNumber property: The current sequence number for the
      * page blob.
@@ -178,6 +219,30 @@ public PageBlobClearPagesHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobClearPagesHeaders object itself.
+     */
+    public PageBlobClearPagesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java
index 7e9aa95c1ff3..2447b0c346b0 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCopyIncrementalHeaders.java
@@ -32,6 +32,13 @@ public final class PageBlobCopyIncrementalHeaders {
     @JsonProperty(value = "Last-Modified")
     private DateTimeRfc1123 lastModified;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -132,6 +139,30 @@ public PageBlobCopyIncrementalHeaders lastModified(OffsetDateTime lastModified)
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobCopyIncrementalHeaders object itself.
+     */
+    public PageBlobCopyIncrementalHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java
index 6c4192fe4806..19b603ab7b6e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobCreateHeaders.java
@@ -41,6 +41,13 @@ public final class PageBlobCreateHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -87,6 +94,13 @@ public final class PageBlobCreateHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the blob. This header is only
+     * returned when the blob was encrypted with customer specified encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -174,6 +188,30 @@ public PageBlobCreateHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobCreateHeaders object itself.
+     */
+    public PageBlobCreateHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -321,6 +359,30 @@ public PageBlobCreateHeaders encryptionKeySha256(String encryptionKeySha256) {
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the blob. This header is only returned when the blob was encrypted with
+     * customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the PageBlobCreateHeaders object itself.
+     */
+    public PageBlobCreateHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java
index c1d14635bf44..da04c9aff1b9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesDiffHeaders.java
@@ -38,6 +38,13 @@ public final class PageBlobGetPageRangesDiffHeaders {
     @JsonProperty(value = "x-ms-blob-content-length")
     private Long blobContentLength;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public PageBlobGetPageRangesDiffHeaders blobContentLength(Long blobContentLength
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobGetPageRangesDiffHeaders object itself.
+     */
+    public PageBlobGetPageRangesDiffHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java
index 32b37ef1452c..90a9a9add17d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobGetPageRangesHeaders.java
@@ -38,6 +38,13 @@ public final class PageBlobGetPageRangesHeaders {
     @JsonProperty(value = "x-ms-blob-content-length")
     private Long blobContentLength;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -143,6 +150,30 @@ public PageBlobGetPageRangesHeaders blobContentLength(Long blobContentLength) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobGetPageRangesHeaders object itself.
+     */
+    public PageBlobGetPageRangesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java
index e03c8720d2b6..43470469598d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobResizeHeaders.java
@@ -39,6 +39,13 @@ public final class PageBlobResizeHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -146,6 +153,30 @@ public PageBlobResizeHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobResizeHeaders object itself.
+     */
+    public PageBlobResizeHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java
index 5f606b24c262..52a2b49532c9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUpdateSequenceNumberHeaders.java
@@ -39,6 +39,13 @@ public final class PageBlobUpdateSequenceNumberHeaders {
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -146,6 +153,30 @@ public PageBlobUpdateSequenceNumberHeaders blobSequenceNumber(Long blobSequenceN
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobUpdateSequenceNumberHeaders object itself.
+     */
+    public PageBlobUpdateSequenceNumberHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java
index cebeb20842e3..d80a0eb276cd 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesFromURLHeaders.java
@@ -41,6 +41,14 @@ public final class PageBlobUploadPagesFromURLHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The current sequence number for the page blob.
      */
@@ -164,6 +172,32 @@ public PageBlobUploadPagesFromURLHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the PageBlobUploadPagesFromURLHeaders object itself.
+     */
+    public PageBlobUploadPagesFromURLHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the blobSequenceNumber property: The current sequence number for the
      * page blob.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java
index 7dd8eb12ae72..ed9c5a3191a9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PageBlobUploadPagesHeaders.java
@@ -41,12 +41,27 @@ public final class PageBlobUploadPagesHeaders {
     @JsonProperty(value = "Content-MD5")
     private byte[] contentMD5;
 
+    /*
+     * This header is returned so that the client can check for message content
+     * integrity. The value of this header is computed by the Blob service; it
+     * is not necessarily the same value specified in the request headers.
+     */
+    @JsonProperty(value = "x-ms-content-crc64")
+    private byte[] xMsContentCrc64;
+
     /*
      * The current sequence number for the page blob.
      */
     @JsonProperty(value = "x-ms-blob-sequence-number")
     private Long blobSequenceNumber;
 
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -85,6 +100,14 @@ public final class PageBlobUploadPagesHeaders {
     @JsonProperty(value = "x-ms-encryption-key-sha256")
     private String encryptionKeySha256;
 
+    /*
+     * The encryption scope used to encrypt the pages. This header is only
+     * returned when the pages were encrypted with customer specified
+     * encryption.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String encryptionScope;
+
     /*
      * The errorCode property.
      */
@@ -172,6 +195,32 @@ public PageBlobUploadPagesHeaders contentMD5(byte[] contentMD5) {
         return this;
     }
 
+    /**
+     * Get the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @return the xMsContentCrc64 value.
+     */
+    public byte[] xMsContentCrc64() {
+        return ImplUtils.clone(this.xMsContentCrc64);
+    }
+
+    /**
+     * Set the xMsContentCrc64 property: This header is returned so that the
+     * client can check for message content integrity. The value of this header
+     * is computed by the Blob service; it is not necessarily the same value
+     * specified in the request headers.
+     *
+     * @param xMsContentCrc64 the xMsContentCrc64 value to set.
+     * @return the PageBlobUploadPagesHeaders object itself.
+     */
+    public PageBlobUploadPagesHeaders xMsContentCrc64(byte[] xMsContentCrc64) {
+        this.xMsContentCrc64 = ImplUtils.clone(xMsContentCrc64);
+        return this;
+    }
+
     /**
      * Get the blobSequenceNumber property: The current sequence number for the
      * page blob.
@@ -194,6 +243,30 @@ public PageBlobUploadPagesHeaders blobSequenceNumber(Long blobSequenceNumber) {
         return this;
     }
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the PageBlobUploadPagesHeaders object itself.
+     */
+    public PageBlobUploadPagesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
@@ -317,6 +390,30 @@ public PageBlobUploadPagesHeaders encryptionKeySha256(String encryptionKeySha256
         return this;
     }
 
+    /**
+     * Get the encryptionScope property: The encryption scope used to encrypt
+     * the pages. This header is only returned when the pages were encrypted
+     * with customer specified encryption.
+     *
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The encryption scope used to encrypt
+     * the pages. This header is only returned when the pages were encrypted
+     * with customer specified encryption.
+     *
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the PageBlobUploadPagesHeaders object itself.
+     */
+    public PageBlobUploadPagesHeaders encryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PathRenameMode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PathRenameMode.java
new file mode 100644
index 000000000000..a63e11af27c3
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PathRenameMode.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.storage.blob.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for PathRenameMode.
+ */
+public enum PathRenameMode {
+    /**
+     * Enum value legacy.
+     */
+    LEGACY("legacy"),
+
+    /**
+     * Enum value posix.
+     */
+    POSIX("posix");
+
+    /**
+     * The actual serialized value for a PathRenameMode instance.
+     */
+    private final String value;
+
+    PathRenameMode(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a PathRenameMode instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed PathRenameMode object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static PathRenameMode fromString(String value) {
+        PathRenameMode[] items = PathRenameMode.values();
+        for (PathRenameMode item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java
new file mode 100644
index 000000000000..8fc928767f37
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/**
+ * Defines values for RehydratePriority.
+ */
+public final class RehydratePriority extends ExpandableStringEnum<RehydratePriority> {
+    /**
+     * Static value High for RehydratePriority.
+     */
+    public static final RehydratePriority HIGH = fromString("High");
+
+    /**
+     * Static value Standard for RehydratePriority.
+     */
+    public static final RehydratePriority STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a RehydratePriority from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding RehydratePriority.
+     */
+    @JsonCreator
+    public static RehydratePriority fromString(String name) {
+        return fromString(name, RehydratePriority.class);
+    }
+
+    /**
+     * @return known RehydratePriority values.
+     */
+    public static Collection<RehydratePriority> values() {
+        return values(RehydratePriority.class);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceFilterBlobsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceFilterBlobsHeaders.java
new file mode 100644
index 000000000000..ca07c5d37ffb
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceFilterBlobsHeaders.java
@@ -0,0 +1,201 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.DateTimeRfc1123;
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/**
+ * Defines headers for FilterBlobs operation.
+ */
+@JacksonXmlRootElement(localName = "Service-FilterBlobs-Headers")
+@Fluent
+public final class ServiceFilterBlobsHeaders {
+    /*
+     * The media type of the body of the response. For Filter Blobs this is
+     * 'application/xml'
+     */
+    @JsonProperty(value = "Content-Type")
+    private String contentType;
+
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
+    /*
+     * This header uniquely identifies the request that was made and can be
+     * used for troubleshooting the request.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String requestId;
+
+    /*
+     * Indicates the version of the Blob service used to execute the request.
+     * This header is returned for requests made against version 2009-09-19 and
+     * above.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String version;
+
+    /*
+     * UTC date/time value generated by the service that indicates the time at
+     * which the response was initiated
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /*
+     * The errorCode property.
+     */
+    @JsonProperty(value = "x-ms-error-code")
+    private String errorCode;
+
+    /**
+     * Get the contentType property: The media type of the body of the
+     * response. For Filter Blobs this is 'application/xml'.
+     *
+     * @return the contentType value.
+     */
+    public String contentType() {
+        return this.contentType;
+    }
+
+    /**
+     * Set the contentType property: The media type of the body of the
+     * response. For Filter Blobs this is 'application/xml'.
+     *
+     * @param contentType the contentType value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders contentType(String contentType) {
+        this.contentType = contentType;
+        return this;
+    }
+
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @return the requestId value.
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set the requestId property: This header uniquely identifies the request
+     * that was made and can be used for troubleshooting the request.
+     *
+     * @param requestId the requestId value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders requestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get the version property: Indicates the version of the Blob service used
+     * to execute the request. This header is returned for requests made
+     * against version 2009-09-19 and above.
+     *
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: Indicates the version of the Blob service used
+     * to execute the request. This header is returned for requests made
+     * against version 2009-09-19 and above.
+     *
+     * @param version the version value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders version(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime dateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.dateTime();
+    }
+
+    /**
+     * Set the dateProperty property: UTC date/time value generated by the
+     * service that indicates the time at which the response was initiated.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders dateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+
+    /**
+     * Get the errorCode property: The errorCode property.
+     *
+     * @return the errorCode value.
+     */
+    public String errorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * Set the errorCode property: The errorCode property.
+     *
+     * @param errorCode the errorCode value to set.
+     * @return the ServiceFilterBlobsHeaders object itself.
+     */
+    public ServiceFilterBlobsHeaders errorCode(String errorCode) {
+        this.errorCode = errorCode;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java
index 88fa50830518..aab5284aa123 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Service-GetAccountInfo-Headers")
 @Fluent
 public final class ServiceGetAccountInfoHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -59,6 +66,30 @@ public final class ServiceGetAccountInfoHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetAccountInfoHeaders object itself.
+     */
+    public ServiceGetAccountInfoHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java
index 3b5b06ab3259..4fec9f3c872d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetPropertiesHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Service-GetProperties-Headers")
 @Fluent
 public final class ServiceGetPropertiesHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class ServiceGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetPropertiesHeaders object itself.
+     */
+    public ServiceGetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java
index 55dda9cc8ddb..a10d852f62cd 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetStatisticsHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Service-GetStatistics-Headers")
 @Fluent
 public final class ServiceGetStatisticsHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class ServiceGetStatisticsHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetStatisticsHeaders object itself.
+     */
+    public ServiceGetStatisticsHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java
index 4a74086587af..f10866c90c55 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceGetUserDelegationKeyHeaders.java
@@ -16,6 +16,13 @@
 @JacksonXmlRootElement(localName = "Service-GetUserDelegationKey-Headers")
 @Fluent
 public final class ServiceGetUserDelegationKeyHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -44,6 +51,30 @@ public final class ServiceGetUserDelegationKeyHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceGetUserDelegationKeyHeaders object itself.
+     */
+    public ServiceGetUserDelegationKeyHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java
index 94908506ede7..93e1c98ec97a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceListContainersSegmentHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Service-ListContainersSegment-Headers")
 @Fluent
 public final class ServiceListContainersSegmentHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class ServiceListContainersSegmentHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceListContainersSegmentHeaders object itself.
+     */
+    public ServiceListContainersSegmentHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java
index df15cc766400..b7ea86bc9fdb 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServiceSetPropertiesHeaders.java
@@ -14,6 +14,13 @@
 @JacksonXmlRootElement(localName = "Service-SetProperties-Headers")
 @Fluent
 public final class ServiceSetPropertiesHeaders {
+    /*
+     * If a client request id header is sent in the request, this header will
+     * be present in the response with the same value.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String clientRequestId;
+
     /*
      * This header uniquely identifies the request that was made and can be
      * used for troubleshooting the request.
@@ -35,6 +42,30 @@ public final class ServiceSetPropertiesHeaders {
     @JsonProperty(value = "x-ms-error-code")
     private String errorCode;
 
+    /**
+     * Get the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @return the clientRequestId value.
+     */
+    public String clientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * Set the clientRequestId property: If a client request id header is sent
+     * in the request, this header will be present in the response with the
+     * same value.
+     *
+     * @param clientRequestId the clientRequestId value to set.
+     * @return the ServiceSetPropertiesHeaders object itself.
+     */
+    public ServiceSetPropertiesHeaders clientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+        return this;
+    }
+
     /**
      * Get the requestId property: This header uniquely identifies the request
      * that was made and can be used for troubleshooting the request.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServicesFilterBlobsResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServicesFilterBlobsResponse.java
new file mode 100644
index 000000000000..1ab8de38f430
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ServicesFilterBlobsResponse.java
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/**
+ * Contains all response data for the filterBlobs operation.
+ */
+public final class ServicesFilterBlobsResponse extends ResponseBase<ServiceFilterBlobsHeaders, FilterBlobsResponse> {
+    /**
+     * Creates an instance of ServicesFilterBlobsResponse.
+     *
+     * @param request the request which resulted in this ServicesFilterBlobsResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public ServicesFilterBlobsResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, FilterBlobsResponse value, ServiceFilterBlobsHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+
+    /**
+     * @return the deserialized response body.
+     */
+    @Override
+    public FilterBlobsResponse value() {
+        return super.value();
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java
index 2f8f01f4f6f9..34b97f155d7d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageError.java
@@ -14,38 +14,12 @@
 @JacksonXmlRootElement(localName = "StorageError")
 @Fluent
 public final class StorageError {
-    /*
-     * The code property.
-     */
-    @JsonProperty(value = "Code")
-    private String code;
-
     /*
      * The message property.
      */
     @JsonProperty(value = "Message")
     private String message;
 
-    /**
-     * Get the code property: The code property.
-     *
-     * @return the code value.
-     */
-    public String code() {
-        return this.code;
-    }
-
-    /**
-     * Set the code property: The code property.
-     *
-     * @param code the code value to set.
-     * @return the StorageError object itself.
-     */
-    public StorageError code(String code) {
-        this.code = code;
-        return this;
-    }
-
     /**
      * Get the message property: The message property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java
index 5ef1a7209dee..36fc044b9211 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java
@@ -32,11 +32,6 @@ public final class StorageErrorCode extends ExpandableStringEnum<StorageErrorCod
      */
     public static final StorageErrorCode AUTHENTICATION_FAILED = fromString("AuthenticationFailed");
 
-    /**
-     * Static value AuthorizationFailure for StorageErrorCode.
-     */
-    public static final StorageErrorCode AUTHORIZATION_FAILURE = fromString("AuthorizationFailure");
-
     /**
      * Static value ConditionHeadersNotSupported for StorageErrorCode.
      */
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/Tag.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/Tag.java
new file mode 100644
index 000000000000..121da3ef84ba
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/Tag.java
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.models;
+
+import com.azure.core.implementation.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * Represents a single user-provided tag.
+ */
+@JacksonXmlRootElement(localName = "Tag")
+@Fluent
+public final class Tag {
+    /*
+     * The tag name.
+     */
+    @JsonProperty(value = "Key", required = true)
+    private String key;
+
+    /*
+     * The tag value.
+     */
+    @JsonProperty(value = "Value", required = true)
+    private String value;
+
+    /**
+     * Get the key property: The tag name.
+     *
+     * @return the key value.
+     */
+    public String key() {
+        return this.key;
+    }
+
+    /**
+     * Set the key property: The tag name.
+     *
+     * @param key the key value to set.
+     * @return the Tag object itself.
+     */
+    public Tag key(String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     * Get the value property: The tag value.
+     *
+     * @return the value value.
+     */
+    public String value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The tag value.
+     *
+     * @param value the value value to set.
+     * @return the Tag object itself.
+     */
+    public Tag value(String value) {
+        this.value = value;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy
index 5d6f364f7e5e..39cf262b6d70 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/AppendBlobAPITest.groovy
@@ -157,7 +157,7 @@ class AppendBlobAPITest extends APISpec {
 
         downloadStream.toByteArray() == defaultData.array()
         validateBasicHeaders(appendResponse.headers())
-        appendResponse.value().contentMD5() != null
+        appendResponse.headers().value("x-ms-content-crc64") != null
         appendResponse.value().blobAppendOffset() != null
         appendResponse.value().blobCommittedBlockCount() != null
         Integer.parseInt(bu.getProperties().headers().value("x-ms-blob-committed-block-count")) == 1
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy
index d5aaa8a65dcd..88564a9909dd 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlockBlobAPITest.groovy
@@ -32,7 +32,7 @@ class BlockBlobAPITest extends APISpec {
 
         expect:
         response.statusCode() == 201
-        headers.value("Content-MD5") != null
+        headers.value("x-ms-content-crc64") != null
         headers.value("x-ms-request-id") != null
         headers.value("x-ms-version") != null
         headers.value("Date") != null
@@ -128,7 +128,7 @@ class BlockBlobAPITest extends APISpec {
         then:
         headers.value("x-ms-request-id") != null
         headers.value("x-ms-version") != null
-        headers.value("Content-MD5") != null
+        headers.value("x-ms-content-crc64") != null
         headers.value("x-ms-request-server-encrypted") != null
 
 
@@ -311,7 +311,7 @@ class BlockBlobAPITest extends APISpec {
         then:
         response.statusCode() == 201
         validateBasicHeaders(headers)
-        headers.value("Content-MD5")
+        headers.value("x-ms-content-crc64")
         Boolean.parseBoolean(headers.value("x-ms-request-server-encrypted"))
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy
index 26e8ce24a9a0..d3a4cc29e182 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/PageBlobAPITest.groovy
@@ -167,7 +167,7 @@ class PageBlobAPITest extends APISpec {
         then:
         response.statusCode() == 201
         validateBasicHeaders(response.headers())
-        response.value().contentMD5() != null
+        response.headers().value("x-ms-content-crc64") != null
         response.value().blobSequenceNumber() == 0
         response.value().isServerEncrypted()
     }
diff --git a/sdk/storage/azure-storage-blob/swagger/README.md b/sdk/storage/azure-storage-blob/swagger/README.md
new file mode 100644
index 000000000000..b9a99db8214a
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/swagger/README.md
@@ -0,0 +1,870 @@
+# Azure Blob Storage for Java
+
+> see https://aka.ms/autorest
+
+### Setup
+```ps
+cd C:\work
+git clone --recursive https://github.com/Azure/autorest.java/
+cd autorest.java
+git checkout v3
+npm install
+cd ..
+git clone --recursive https://github.com/jianghaolu/autorest.modeler/
+cd autorest.modeler
+git checkout headerprefixfix
+npm install
+```
+
+### Generation
+```ps
+cd <swagger-folder>
+autorest --use=C:/work/autorest.java --use=C:/work/autorest.modeler --version=2.0.4280
+```
+
+Due to limitations, after generation has completed add the `@JsonDeserialize(using = CustomHierarchicalListingDeserializer.class)` annotation to `BlobHierarchyListSegment`.
+
+### Code generation settings
+``` yaml
+input-file: ./blob-2019-02-02.json
+java: true
+output-folder: ../
+namespace: com.azure.storage.blob
+enable-xml: true
+generate-client-interfaces: false
+sync-methods: none
+license-header: MICROSOFT_MIT_SMALL
+add-context-parameter: true
+```
+
+### /{containerName}?restype=container
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=acl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=acl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&acquire
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&acquire"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&release
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&release"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&renew
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&renew"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&break
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&break"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?comp=lease&restype=container&change
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?comp=lease&restype=container&change"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=list&flat
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=list&flat"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=container&comp=list&hierarchy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=container&comp=list&hierarchy"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}?restype=account&comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}?restype=account&comp=properties"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ContainerName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{containerName}/{blob}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+        $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+        $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+        $.get.description = "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or version.";
+        $.head.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+        $.head.parameters.splice(1, 0, { "$ref": path + "Blob" });
+        $.delete.description = "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound). If the storage account's automatic snapshot feature is enabled, then, when a blob is deleted, an automatic snapshot is created. The blob becomes inaccessible immediately. All other operations on the blob causes the service to return an HTTP status code of 404 (ResourceNotFound). You can access automatic snapshot using snapshot timestamp or version id. You can restore the blob by calling Put or Copy Blob API with automatic snapshot as source. Deleting automatic snapshot requires shared key or special SAS/RBAC permissions.";
+        $.delete.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+        $.delete.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?PageBlob
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?PageBlob"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?AppendBlob
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?AppendBlob"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=appendblock
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=appendblock"]
+  transform: >
+    $.put.consumes = ["application/octet-stream"];
+```
+
+### /{containerName}/{blob}?BlockBlob
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?BlockBlob"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=undelete
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=undelete"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=properties&SetHTTPHeaders
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=properties&SetHTTPHeaders"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&acquire
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&acquire"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&release
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&release"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&renew
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&renew"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&change
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&change"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=lease&break
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=lease&break"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=snapshot
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=snapshot"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=copy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=copy"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+      $.put.responses["202"].headers["x-ms-version-id"] = {
+        "x-ms-client-name": "VersionId",
+        "type": "string",
+        "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+      };
+    }
+```
+
+### /{containerName}/{blob}?comp=copy&sync
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=copy&sync"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+      $.put.responses["202"].headers["x-ms-version-id"] = {
+        "x-ms-client-name": "VersionId",
+        "type": "string",
+        "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+      };
+    }
+```
+
+### /{containerName}/{blob}?comp=copy&copyid={CopyId}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=copy&copyid={CopyId}"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=tier
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=tier"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?restype=account&comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?restype=account&comp=properties"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=block
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=block"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=block&fromURL
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=block&fromURL"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=blocklist
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=blocklist"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&update
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&update"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&clear
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&clear"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&clear
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&clear"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=page&update&fromUrl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=page&update&fromUrl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=pagelist
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=pagelist"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.get.description = "The Get Page Ranges operation returns the list of valid page ranges for a page blob, version or snapshot of a page blob";
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=pagelist&diff
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=pagelist&diff"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.get.description = "[Update] The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot or version.";
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=properties&Resize
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=properties&Resize"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=properties&UpdateSequenceNumber
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=properties&UpdateSequenceNumber"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=incrementalcopy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=incrementalcopy"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=appendblock
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=appendblock"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref":  path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref":  path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=appendblock&fromUrl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=appendblock&fromUrl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### BlobItem
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobItem
+  transform: >
+    if (!$.required.includes("VersionId")) {
+      $.required.push("VersionId");
+      $.properties.Metadata.type = "object";
+      $.properties.Metadata.additionalProperties = { "type": "string" };
+      delete $.properties.Metadata.$ref;
+      $.properties.VersionId = { "type": "string" };
+    }
+    $.properties.IsPrefix = { "type": "boolean" };
+```
+
+### BlobMetadata
+Deleting out Encryption until https://github.com/Azure/azure-sdk-for-java/issues/5000 is determined.
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobMetadata
+  transform: >
+    delete $.properties
+```
+
+### BlobProperties
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobProperties
+  transform: >
+    $.properties.CustomerProvidedKeySha256 = { "type": "string" }
+```
+
+### ListBlobsFlatSegmentResponse
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ListBlobsFlatSegmentResponse
+  transform: >
+    if (!$.required.includes("Prefix")) {
+      $.required.push("Prefix");
+      $.required.push("Marker");
+      $.required.push("MaxResults");
+      $.required.push("Delimiter");
+      $.required.push("NextMarker");
+    }
+```
+
+### ListBlobsHierarchySegmentResponse
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ListBlobsHierarchySegmentResponse
+  transform: >
+    if (!$.required.includes("Prefix")) {
+      $.required.push("Prefix");
+      $.required.push("Marker");
+      $.required.push("MaxResults");
+      $.required.push("Delimiter");
+      $.required.push("NextMarker");
+    }
+```
+
+### ListContainersSegmentResponse
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ListContainersSegmentResponse
+  transform: >
+    if (!$.required.includes("Prefix")) {
+      $.required.push("Prefix");
+      $.required.push("MaxResults");
+      $.required.push("NextMarker");
+    }
+```
+
+### SignedIdentifier
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.SignedIdentifier
+  transform: >
+    if ($.xml) {
+      delete $.xml;
+    }
+- from: swagger-document
+  where: $.definitions.SignedIdentifiers
+  transform: >
+    $.items.xml = { "name": "SignedIdentifier" }
+```
+
+### KeyInfo
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.KeyInfo
+  transform: >
+    if ($["x-ms-parameter-location"]) {
+      delete $["x-ms-parameter-location"];
+    }
+```
+
+### Make AccessTier Unique
+autorest.python complains that the same enum has different values
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.AccessTierRequired
+  transform: >
+    $["x-ms-enum"].name = "AccessTierRequired";
+- from: swagger-document
+  where: $.parameters.AccessTierOptional
+  transform: >
+    $["x-ms-enum"].name = "AccessTierOptional";
+```
+
+### Extra parameters
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters
+  transform: >
+    if (!$.CacheControl) {
+      $.CacheControl = {
+        "name": "Cache-Control",
+        "x-ms-client-name": "cacheControl",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Cache control for given resource"
+      };
+    }
+```
+
+### /{containerName}/{blob}?comp=tags
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=tags"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+      $.get.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.get.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{filesystem}/{path}?resource=directory&Create
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?resource=directory&Create"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
+
+### /{filesystem}/{path}?DirectoryRename
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?DirectoryRename"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
+
+### /{filesystem}/{path}?DirectoryDelete
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?DirectoryDelete"]
+  transform: >
+    let param = $.delete.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.delete.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.delete.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
+
+### /{filesystem}/{path}?FileRename
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{filesystem}/{path}?FileRename"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("Filesystem")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "Filesystem" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Path" });
+    }
+```
diff --git a/sdk/storage/azure-storage-blob/swagger/blob-2018-11-09.json b/sdk/storage/azure-storage-blob/swagger/blob-2018-11-09.json
new file mode 100644
index 000000000000..0c15ff232003
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/swagger/blob-2018-11-09.json
@@ -0,0 +1,8010 @@
+{
+    "swagger": "2.0",
+    "info": {
+      "title": "Azure Blob Storage",
+      "version": "2018-11-09",
+      "x-ms-code-generation-settings": {
+        "header": "MIT",
+        "strictSpecAdherence": false
+      }
+    },
+    "x-ms-parameterized-host": {
+      "hostTemplate": "{url}",
+      "useSchemePrefix": false,
+      "positionInOperation": "first",
+      "parameters": [
+        {
+          "$ref": "#/parameters/Url"
+        }
+      ]
+    },
+    "securityDefinitions": {
+      "blob_shared_key": {
+        "type": "apiKey",
+        "name": "Authorization",
+        "in": "header"
+      }
+    },
+    "schemes": [
+      "https"
+    ],
+    "consumes": [
+      "application/xml"
+    ],
+    "produces": [
+      "application/xml"
+    ],
+    "paths": {},
+    "x-ms-paths": {
+      "/?restype=service&comp=properties": {
+        "put": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_SetProperties",
+          "description": "Sets properties for a storage account's Blob service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
+          "parameters": [
+            {
+              "$ref": "#/parameters/StorageServiceProperties"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "Success (Accepted)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetProperties",
+          "description": "gets the properties of a storage account's Blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceProperties"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/?restype=service&comp=stats": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetStatistics",
+          "description": "Retrieves statistics related to replication for the Blob service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceStats"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "stats"
+            ]
+          }
+        ]
+      },
+      "/?comp=list": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_ListContainersSegment",
+          "description": "The List Containers Segment operation returns a list of the containers under the specified account",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListContainersInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListContainersSegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/?restype=service&comp=userdelegationkey": {
+        "post": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetUserDelegationKey",
+          "description": "Retrieves a user delgation key for the Blob service. This is only a valid operation when using bearer token authentication.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/KeyInfo"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/UserDelegationKey"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "userdelegationkey"
+            ]
+          }
+        ]
+      },
+      "/?restype=account&comp=properties": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetAccountInfo",
+          "description": "Returns the sku name and account kind ",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success (OK)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-sku-name": {
+                  "x-ms-client-name": "SkuName",
+                  "type": "string",
+                  "enum": [
+                    "Standard_LRS",
+                    "Standard_GRS",
+                    "Standard_RAGRS",
+                    "Standard_ZRS",
+                    "Premium_LRS"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SkuName",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the sku name of the account"
+                },
+                "x-ms-account-kind": {
+                  "x-ms-client-name": "AccountKind",
+                  "type": "string",
+                  "enum": [
+                    "Storage",
+                    "BlobStorage",
+                    "StorageV2"
+                  ],
+                  "x-ms-enum": {
+                    "name": "AccountKind",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the account kind"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "account"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_Create",
+          "description": "creates a new container under the specified account. If the container with the same name already exists, the operation fails",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/BlobPublicAccess"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "Success, Container created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_GetProperties",
+          "description": "returns all user-defined metadata and system properties for the specified container. The data returned does not include the container's list of blobs",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-public-access": {
+                  "x-ms-client-name": "BlobPublicAccess",
+                  "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                  "type": "string",
+                  "enum": [
+                    "container",
+                    "blob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "PublicAccessType",
+                    "modelAsString": true
+                  }
+                },
+                "x-ms-has-immutability-policy": {
+                  "x-ms-client-name": "HasImmutabilityPolicy",
+                  "description": "Indicates whether the container has an immutability policy set on it.",
+                  "type": "boolean"
+                },
+                "x-ms-has-legal-hold": {
+                  "x-ms-client-name": "HasLegalHold",
+                  "description": "Indicates whether the container has a legal hold.",
+                  "type": "boolean"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_Delete",
+          "description": "operation marks the specified container for deletion. The container and any blobs contained within it are later deleted during garbage collection",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "Accepted",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=metadata": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_SetMetadata",
+          "description": "operation sets one or more user-defined name-value pairs for the specified container.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "metadata"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=acl": {
+        "get": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_GetAccessPolicy",
+          "description": "gets the permissions for the specified container. The permissions indicate whether container data may be accessed publicly.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "x-ms-blob-public-access": {
+                  "x-ms-client-name": "BlobPublicAccess",
+                  "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                  "type": "string",
+                  "enum": [
+                    "container",
+                    "blob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "PublicAccessType",
+                    "modelAsString": true
+                  }
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/SignedIdentifiers"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_SetAccessPolicy",
+          "description": "sets the permissions for the specified container. The permissions indicate whether blobs in a container may be accessed publicly.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ContainerAcl"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobPublicAccess"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acl"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&acquire": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_AcquireLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseDuration"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The Acquire operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a container's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acquire"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&release": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_ReleaseLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Release operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "release"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&renew": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_RenewLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Renew operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a container's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "renew"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&break": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_BreakLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseBreakPeriod"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The Break operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-time": {
+                  "x-ms-client-name": "LeaseTime",
+                  "type": "integer",
+                  "description": "Approximate time remaining in the lease period, in seconds."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "break"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?comp=lease&restype=container&change": {
+        "put": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_ChangeLease",
+          "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Change operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a container's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "change"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=list&flat": {
+        "get": {
+          "tags": [
+            "containers"
+          ],
+          "operationId": "Container_ListBlobFlatSegment",
+          "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListBlobsInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListBlobsFlatSegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=container&comp=list&hierarchy": {
+        "get": {
+          "tags": [
+            "containers"
+          ],
+          "operationId": "Container_ListBlobHierarchySegment",
+          "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Delimiter"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListBlobsInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListBlobsHierarchySegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "container"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/{containerName}?restype=account&comp=properties": {
+        "get": {
+          "tags": [
+            "container"
+          ],
+          "operationId": "Container_GetAccountInfo",
+          "description": "Returns the sku name and account kind ",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success (OK)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-sku-name": {
+                  "x-ms-client-name": "SkuName",
+                  "type": "string",
+                  "enum": [
+                    "Standard_LRS",
+                    "Standard_GRS",
+                    "Standard_RAGRS",
+                    "Standard_ZRS",
+                    "Premium_LRS"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SkuName",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the sku name of the account"
+                },
+                "x-ms-account-kind": {
+                  "x-ms-client-name": "AccountKind",
+                  "type": "string",
+                  "enum": [
+                    "Storage",
+                    "BlobStorage",
+                    "StorageV2"
+                  ],
+                  "x-ms-enum": {
+                    "name": "AccountKind",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the account kind"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "account"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}": {
+        "get": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_Download",
+          "description": "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/GetRangeContentMD5"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Returns the content of the entire blob.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "Content-Length": {
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The number of bytes present in the response body."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                },
+                "Content-Range": {
+                  "type": "string",
+                  "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "Content-Encoding": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Encoding request header"
+                },
+                "Cache-Control": {
+                  "type": "string",
+                  "description": "This header is returned if it was previously specified for the blob."
+                },
+                "Content-Disposition": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                },
+                "Content-Language": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Language request header."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-blob-type": {
+                  "x-ms-client-name": "BlobType",
+                  "description": "The blob's type.",
+                  "type": "string",
+                  "enum": [
+                    "BlockBlob",
+                    "PageBlob",
+                    "AppendBlob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "BlobType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-copy-completion-time": {
+                  "x-ms-client-name": "CopyCompletionTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status-description": {
+                  "x-ms-client-name": "CopyStatusDescription",
+                  "type": "string",
+                  "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-progress": {
+                  "x-ms-client-name": "CopyProgress",
+                  "type": "string",
+                  "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-source": {
+                  "x-ms-client-name": "CopySource",
+                  "type": "string",
+                  "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Accept-Ranges": {
+                  "type": "string",
+                  "description": "Indicates that the service supports requests for partial blob content."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+            "x-ms-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                },
+                "x-ms-blob-content-md5": {
+                  "x-ms-client-name": "BlobContentMD5",
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                }
+              },
+              "schema": {
+                "type": "object",
+                "format": "file"
+              }
+            },
+            "206": {
+              "description": "Returns the content of a specified range of the blob.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "Content-Length": {
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The number of bytes present in the response body."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                },
+                "Content-Range": {
+                  "type": "string",
+                  "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "Content-Encoding": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Encoding request header"
+                },
+                "Cache-Control": {
+                  "type": "string",
+                  "description": "This header is returned if it was previously specified for the blob."
+                },
+                "Content-Disposition": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                },
+                "Content-Language": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Language request header."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-blob-type": {
+                  "x-ms-client-name": "BlobType",
+                  "description": "The blob's type.",
+                  "type": "string",
+                  "enum": [
+                    "BlockBlob",
+                    "PageBlob",
+                    "AppendBlob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "BlobType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-copy-completion-time": {
+                  "x-ms-client-name": "CopyCompletionTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status-description": {
+                  "x-ms-client-name": "CopyStatusDescription",
+                  "type": "string",
+                  "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-progress": {
+                  "x-ms-client-name": "CopyProgress",
+                  "type": "string",
+                  "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-source": {
+                  "x-ms-client-name": "CopySource",
+                  "type": "string",
+                  "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Accept-Ranges": {
+                  "type": "string",
+                  "description": "Indicates that the service supports requests for partial blob content."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+            "x-ms-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                },
+                "x-ms-blob-content-md5": {
+                  "x-ms-client-name": "BlobContentMD5",
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                }
+              },
+              "schema": {
+                "type": "object",
+                "format": "file"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "head": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_GetProperties",
+          "description": "The Get Properties operation returns all user-defined metadata, standard HTTP properties, and system properties for the blob. It does not return the content of the blob.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Returns the properties of the blob.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-creation-time": {
+                  "x-ms-client-name": "CreationTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was created."
+                },
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "x-ms-blob-type": {
+                  "x-ms-client-name": "BlobType",
+                  "description": "The blob's type.",
+                  "type": "string",
+                  "enum": [
+                    "BlockBlob",
+                    "PageBlob",
+                    "AppendBlob"
+                  ],
+                  "x-ms-enum": {
+                    "name": "BlobType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-copy-completion-time": {
+                  "x-ms-client-name": "CopyCompletionTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status-description": {
+                  "x-ms-client-name": "CopyStatusDescription",
+                  "type": "string",
+                  "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-progress": {
+                  "x-ms-client-name": "CopyProgress",
+                  "type": "string",
+                  "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                },
+                "x-ms-copy-source": {
+                  "x-ms-client-name": "CopySource",
+                  "type": "string",
+                  "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-incremental-copy": {
+                  "x-ms-client-name": "IsIncrementalCopy",
+                  "type": "boolean",
+                  "description": "Included if the blob is incremental copy blob."
+                },
+                "x-ms-copy-destination-snapshot": {
+                  "x-ms-client-name": "DestinationSnapshot",
+                  "type": "string",
+                  "description": "Included if the blob is incremental copy blob or incremental copy snapshot, if x-ms-copy-status is success. Snapshot time of the last successful incremental copy snapshot for this blob."
+                },
+                "x-ms-lease-duration": {
+                  "x-ms-client-name": "LeaseDuration",
+                  "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                  "type": "string",
+                  "enum": [
+                    "infinite",
+                    "fixed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseDurationType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-state": {
+                  "x-ms-client-name": "LeaseState",
+                  "description": "Lease state of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "available",
+                    "leased",
+                    "expired",
+                    "breaking",
+                    "broken"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStateType",
+                    "modelAsString": false
+                  }
+                },
+                "x-ms-lease-status": {
+                  "x-ms-client-name": "LeaseStatus",
+                  "description": "The current lease status of the blob.",
+                  "type": "string",
+                  "enum": [
+                    "locked",
+                    "unlocked"
+                  ],
+                  "x-ms-enum": {
+                    "name": "LeaseStatusType",
+                    "modelAsString": false
+                  }
+                },
+                "Content-Length": {
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The number of bytes present in the response body."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The content type specified for the blob. The default content type is 'application/octet-stream'"
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "Content-Encoding": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Encoding request header"
+                },
+                "Content-Disposition": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                },
+                "Content-Language": {
+                  "type": "string",
+                  "description": "This header returns the value that was specified for the Content-Language request header."
+                },
+                "Cache-Control": {
+                  "type": "string",
+                  "description": "This header is returned if it was previously specified for the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "Accept-Ranges": {
+                  "type": "string",
+                  "description": "Indicates that the service supports requests for partial blob content."
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+            "x-ms-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                },
+                "x-ms-access-tier": {
+                  "x-ms-client-name": "AccessTier",
+                  "type": "string",
+                  "description": "The tier of page blob on a premium storage account or tier of block blob on blob storage LRS accounts. For a list of allowed premium page blob tiers, see https://docs.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features. For blob storage LRS accounts, valid values are Hot/Cool/Archive."
+                },
+                "x-ms-access-tier-inferred": {
+                  "x-ms-client-name": "AccessTierInferred",
+                  "type": "boolean",
+                  "description": "For page blobs on a premium storage account only. If the access tier is not explicitly set on the blob, the tier is inferred based on its content length and this header will be returned with true value."
+                },
+                "x-ms-archive-status": {
+                  "x-ms-client-name": "ArchiveStatus",
+                  "type": "string",
+                  "description": "For blob storage LRS accounts, valid values are rehydrate-pending-to-hot/rehydrate-pending-to-cool. If the blob is being rehydrated and is not complete then this header is returned indicating that rehydrate is pending and also tells the destination tier."
+                },
+                "x-ms-access-tier-change-time": {
+                  "x-ms-client-name": "AccessTierChangeTime",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "The time the tier was changed on the object. This is only returned if the tier on the block blob was ever set."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_Delete",
+          "description": "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound).",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/DeleteSnapshots"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The delete request was accepted and the blob will be deleted.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        }
+      },
+      "/{containerName}/{blob}?PageBlob": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "PageBlob_Create",
+          "description": "The Create operation creates a new page blob.",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLengthRequired"
+            },
+            {
+              "$ref": "#/parameters/BlobSequenceNumber"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The blob was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+            "x-ms-request-server-encrypted": {
+          "x-ms-client-name": "IsServerEncrypted",
+          "type": "boolean",
+          "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+            }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-blob-type",
+            "x-ms-client-name": "blobType",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+            "type": "string",
+            "enum": [
+              "PageBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?AppendBlob": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "AppendBlob_Create",
+          "description": "The Create Append Blob operation creates a new append blob.",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The blob was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-blob-type",
+            "x-ms-client-name": "blobType",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+            "type": "string",
+            "enum": [
+              "AppendBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?BlockBlob": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "BlockBlob_Upload",
+          "description": "The Upload Block Blob operation updates the content of an existing block blob. Updating an existing block blob overwrites any existing metadata on the blob. Partial updates are not supported with Put Blob; the content of the existing blob is overwritten with the content of the new blob. To perform a partial update of the content of a block blob, use the Put Block List operation.",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The blob was updated.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-blob-type",
+            "x-ms-client-name": "blobType",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+            "type": "string",
+            "enum": [
+              "BlockBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=undelete": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_Undelete",
+          "description": "Undelete a blob that was previously soft deleted",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The blob was undeleted successfully.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "undelete"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=properties&SetHTTPHeaders": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_SetHTTPHeaders",
+          "description": "The Set HTTP Headers operation sets system properties on the blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The properties were set successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=metadata": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_SetMetadata",
+          "description": "The Set Blob Metadata operation sets user-defined metadata for the specified blob as one or more name-value pairs",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The metadata was set successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "metadata"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&acquire": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_AcquireLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseDuration"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The Acquire operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a blobs's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acquire"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&release": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_ReleaseLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Release operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "release"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&renew": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_RenewLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Renew operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a blobs's lease"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "renew"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&change": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_ChangeLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/ProposedLeaseIdRequired"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Change operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-lease-id": {
+                  "x-ms-client-name": "LeaseId",
+                  "type": "string",
+                  "description": "Uniquely identifies a blobs's lease"
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "change"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=lease&break": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_BreakLease",
+          "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseBreakPeriod"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The Break operation completed successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-lease-time": {
+                  "x-ms-client-name": "LeaseTime",
+                  "type": "integer",
+                  "description": "Approximate time remaining in the lease period, in seconds."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "lease"
+            ]
+          },
+          {
+            "name": "x-ms-lease-action",
+            "x-ms-client-name": "action",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "break"
+            ],
+            "x-ms-enum": {
+              "name": "LeaseAction",
+              "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Describes what lease action to take."
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=snapshot": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_CreateSnapshot",
+          "description": "The Create Snapshot operation creates a read-only snapshot of a blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The snaptshot was taken successfully.",
+              "headers": {
+                "x-ms-snapshot": {
+                  "x-ms-client-name": "Snapshot",
+                  "type": "string",
+                  "description": "Uniquely identifies the snapshot and indicates the snapshot version. It may be used in subsequent requests to access the snapshot"
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "snapshot"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=copy": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_StartCopyFromURL",
+          "description": "The Start Copy From URL operation copies a blob or an internet resource to a new blob.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/CopySource"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The copy blob has been accepted with the specified copy status.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{containerName}/{blob}?comp=copy&sync": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_CopyFromURL",
+          "description": "The Copy From URL operation copies a blob or an internet resource to a new blob. It will not return a response until the copy is complete.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/CopySource"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The copy has completed.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "success"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SyncCopyStatusType",
+                    "modelAsString": false
+                  }
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "x-ms-requires-sync",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "true"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=copy&copyid={CopyId}": {
+        "put": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_AbortCopyFromURL",
+          "description": "The Abort Copy From URL operation aborts a pending Copy From URL operation, and leaves a destination blob with zero length and full metadata.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/CopyId"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "The delete request was accepted and the blob will be deleted.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "copy"
+            ]
+          },
+          {
+            "name": "x-ms-copy-action",
+            "x-ms-client-name": "copyActionAbortConstant",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "abort"
+            ],
+            "x-ms-parameter-location": "method"
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=tier": {
+        "put": {
+          "tags": [
+            "blobs"
+          ],
+          "operationId": "Blob_SetTier",
+          "description": "The Set Tier operation sets the tier on a blob. The operation is allowed on a page blob in a premium storage account and on a block blob in a blob storage account (locally redundant storage only). A premium page blob's tier determines the allowed size, IOPS, and bandwidth of the blob. A block blob's tier determines Hot/Cool/Archive storage type. This operation does not update the blob's ETag.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/AccessTier"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The new tier will take effect immediately.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and newer."
+                }
+              }
+            },
+            "202": {
+              "description": "The transition to the new tier is pending.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and newer."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "tier"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?restype=account&comp=properties": {
+        "get": {
+          "tags": [
+            "blob"
+          ],
+          "operationId": "Blob_GetAccountInfo",
+          "description": "Returns the sku name and account kind ",
+          "parameters": [
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success (OK)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-sku-name": {
+                  "x-ms-client-name": "SkuName",
+                  "type": "string",
+                  "enum": [
+                    "Standard_LRS",
+                    "Standard_GRS",
+                    "Standard_RAGRS",
+                    "Standard_ZRS",
+                    "Premium_LRS"
+                  ],
+                  "x-ms-enum": {
+                    "name": "SkuName",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the sku name of the account"
+                },
+                "x-ms-account-kind": {
+                  "x-ms-client-name": "AccountKind",
+                  "type": "string",
+                  "enum": [
+                    "Storage",
+                    "BlobStorage",
+                    "StorageV2"
+                  ],
+                  "x-ms-enum": {
+                    "name": "AccountKind",
+                    "modelAsString": false
+                  },
+                  "description": "Identifies the account kind"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "account"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=block": {
+        "put": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_StageBlock",
+          "description": "The Stage Block operation creates a new block to be committed as part of a blob",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/BlockId"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/ContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "block"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=block&fromURL": {
+        "put": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_StageBlockFromURL",
+          "description": "The Stage Block operation creates a new block to be committed as part of a blob where the contents are read from a URL.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/BlockId"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/SourceUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceRange"
+            },
+            {
+              "$ref": "#/parameters/SourceContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+             {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+              }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                  },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "block"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=blocklist": {
+        "put": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_CommitBlockList",
+          "description": "The Commit Block List operation writes a blob by specifying the list of block IDs that make up the blob. In order to be written as part of a blob, a block must have been successfully written to the server in a prior Put Block operation. You can call Put Block List to update a blob by uploading only those blocks that have changed, then committing the new and existing blocks together. You can do this by specifying whether to commit a block from the committed block list or from the uncommitted block list, or to commit the most recently uploaded version of the block, whichever list it may belong to.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/BlobCacheControl"
+            },
+            {
+              "$ref": "#/parameters/BlobContentType"
+            },
+            {
+              "$ref": "#/parameters/BlobContentEncoding"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLanguage"
+            },
+            {
+              "$ref": "#/parameters/BlobContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobContentDisposition"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "name": "blocks",
+              "in": "body",
+              "required": true,
+              "schema": {
+                "$ref": "#/definitions/BlockLookupList"
+              }
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block list was recorded.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "blockblob"
+          ],
+          "operationId": "BlockBlob_GetBlockList",
+          "description": "The Get Block List operation retrieves the list of blocks that have been uploaded as part of a block blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/BlockListType"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The page range was written.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Content-Type": {
+                  "type": "string",
+                  "description": "The media type of the body of the response. For Get Block List this is 'application/xml'"
+                },
+                "x-ms-blob-content-length": {
+                  "x-ms-client-name": "BlobContentLength",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The size of the blob in bytes."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/BlockList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "blocklist"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=page&update": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_UploadPages",
+          "description": "The Upload Pages operation writes a range of pages to a page blob",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/ContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThan"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The page range was written.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for the page blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+            },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "page"
+            ]
+          },
+          {
+            "name": "x-ms-page-write",
+            "x-ms-client-name": "pageWrite",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+            "type": "string",
+            "enum": [
+              "update"
+            ],
+            "x-ms-enum": {
+              "name": "PageWriteType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=page&clear": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_ClearPages",
+          "description": "The Clear Pages operation clears a set of pages from a page blob",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThan"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The page range was cleared.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for the page blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "page"
+            ]
+          },
+          {
+            "name": "x-ms-page-write",
+            "x-ms-client-name": "pageWrite",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+            "type": "string",
+            "enum": [
+              "clear"
+            ],
+            "x-ms-enum": {
+              "name": "PageWriteType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=page&update&fromUrl": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_UploadPagesFromURL",
+          "description": "The Upload Pages operation writes a range of pages to a page blob where the contents are read from a URL",
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "parameters": [
+            {
+              "$ref": "#/parameters/SourceUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceRangeRequiredPutPageFromUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceContentMD5"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/RangeRequiredPutPageFromUrl"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberLessThan"
+            },
+            {
+              "$ref": "#/parameters/IfSequenceNumberEqualTo"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The page range was written.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for the page blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "page"
+            ]
+          },
+          {
+            "name": "x-ms-page-write",
+            "x-ms-client-name": "pageWrite",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+            "type": "string",
+            "enum": [
+              "update"
+            ],
+            "x-ms-enum": {
+              "name": "PageWriteType",
+              "modelAsString": false
+            }
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=pagelist": {
+        "get": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_GetPageRanges",
+          "description": "The Get Page Ranges operation returns the list of valid page ranges for a page blob or snapshot of a page blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Information on the page blob was found.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "x-ms-blob-content-length": {
+                  "x-ms-client-name": "BlobContentLength",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The size of the blob in bytes."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/PageList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "pagelist"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=pagelist&diff": {
+        "get": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_GetPageRangesDiff",
+          "description": "The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Snapshot"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/PrevSnapshot"
+            },
+            {
+              "$ref": "#/parameters/Range"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Information on the page blob was found.",
+              "headers": {
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "x-ms-blob-content-length": {
+                  "x-ms-client-name": "BlobContentLength",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The size of the blob in bytes."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/PageList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "pagelist"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=properties&Resize": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_Resize",
+          "description": "Resize the Blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/BlobContentLengthRequired"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The Blob was resized successfully",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=properties&UpdateSequenceNumber": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_UpdateSequenceNumber",
+          "description": "Update the sequence number of the blob",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/SequenceNumberAction"
+            },
+            {
+              "$ref": "#/parameters/BlobSequenceNumber"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "The sequence numbers were updated successfully.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-blob-sequence-number": {
+                  "x-ms-client-name": "BlobSequenceNumber",
+                  "type": "integer",
+                  "format": "int64",
+                  "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=incrementalcopy": {
+        "put": {
+          "tags": [
+            "pageblob"
+          ],
+          "operationId": "PageBlob_CopyIncremental",
+          "description": "The Copy Incremental operation copies a snapshot of the source page blob to a destination page blob. The snapshot is copied such that only the differential changes between the previously copied snapshot are transferred to the destination. The copied snapshots are complete copies of the original snapshot and can be read or copied from as usual. This API is supported since REST version 2016-05-31.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/CopySource"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "The blob was copied.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-copy-id": {
+                  "x-ms-client-name": "CopyId",
+                  "type": "string",
+                  "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                },
+                "x-ms-copy-status": {
+                  "x-ms-client-name": "CopyStatus",
+                  "description": "State of the copy operation identified by x-ms-copy-id.",
+                  "type": "string",
+                  "enum": [
+                    "pending",
+                    "success",
+                    "aborted",
+                    "failed"
+                  ],
+                  "x-ms-enum": {
+                    "name": "CopyStatusType",
+                    "modelAsString": false
+                  }
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "incrementalcopy"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=appendblock": {
+        "put": {
+          "tags": [
+            "appendblob"
+          ],
+          "consumes": [
+            "application/octet-stream"
+          ],
+          "operationId": "AppendBlob_AppendBlock",
+          "description": "The Append Block operation commits a new block of data to the end of an existing append blob. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Body"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/ContentMD5"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionMaxSize"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionAppendPos"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-append-offset": {
+                  "x-ms-client-name": "BlobAppendOffset",
+                  "type": "string",
+                  "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                },
+                "x-ms-request-server-encrypted": {
+                  "x-ms-client-name": "IsServerEncrypted",
+                  "type": "boolean",
+                  "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "appendblock"
+            ]
+          }
+        ]
+      },
+      "/{containerName}/{blob}?comp=appendblock&fromUrl": {
+        "put": {
+          "tags": [
+            "appendblob"
+          ],
+          "operationId": "AppendBlob_AppendBlockFromUrl",
+          "description": "The Append Block operation commits a new block of data to the end of an existing append blob where the contents are read from a source url. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/SourceUrl"
+            },
+            {
+              "$ref": "#/parameters/SourceRange"
+            },
+            {
+              "$ref": "#/parameters/SourceContentMD5"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ContentLength"
+            },
+            {
+              "$ref": "#/parameters/LeaseIdOptional"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionMaxSize"
+            },
+            {
+              "$ref": "#/parameters/BlobConditionAppendPos"
+            },
+            {
+              "$ref": "#/parameters/IfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/IfMatch"
+            },
+            {
+              "$ref": "#/parameters/IfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfModifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfUnmodifiedSince"
+            },
+            {
+              "$ref": "#/parameters/SourceIfMatch"
+            },
+            {
+              "$ref": "#/parameters/SourceIfNoneMatch"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "The block was created.",
+              "headers": {
+                "ETag": {
+                  "type": "string",
+                  "format": "etag",
+                  "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                },
+                "Last-Modified": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                },
+                "Content-MD5": {
+                  "type": "string",
+                  "format": "byte",
+                  "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-blob-append-offset": {
+                  "x-ms-client-name": "BlobAppendOffset",
+                  "type": "string",
+                  "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                },
+                "x-ms-blob-committed-block-count": {
+                  "x-ms-client-name": "BlobCommittedBlockCount",
+                  "type": "integer",
+                  "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "appendblock"
+            ]
+          }
+        ]
+      }
+    },
+    "definitions": {
+      "KeyInfo": {
+        "type": "object",
+        "required": [
+          "Start",
+          "Expiry"
+        ],
+        "description": "Key information",
+        "properties": {
+          "Start": {
+            "description": "The date-time the key is active in ISO 8601 UTC time",
+            "type": "string"
+          },
+          "Expiry": {
+            "description": "The date-time the key expires in ISO 8601 UTC time",
+            "type": "string"
+          }
+        }
+      },
+      "UserDelegationKey": {
+        "type": "object",
+        "required": [
+          "SignedOid",
+          "SignedTid",
+          "SignedStart",
+          "SignedExpiry",
+          "SignedService",
+          "SignedVersion",
+          "Value"
+        ],
+        "description": "A user delegation key",
+        "properties": {
+          "SignedOid": {
+            "description": "The Azure Active Directory object ID in GUID format.",
+            "type": "string"
+          },
+          "SignedTid": {
+            "description": "The Azure Active Directory tenant ID in GUID format",
+            "type": "string"
+          },
+          "SignedStart": {
+            "description": "The date-time the key is active",
+            "type": "string",
+            "format": "date-time"
+          },
+          "SignedExpiry": {
+            "description": "The date-time the key expires",
+            "type": "string",
+            "format": "date-time"
+          },
+          "SignedService": {
+            "description": "Abbreviation of the Azure Storage service that accepts the key",
+            "type": "string"
+          },
+          "SignedVersion": {
+            "description": "The service version that created the key",
+            "type": "string"
+          },
+          "Value": {
+            "description": "The key as a base64 string",
+            "type": "string"
+          }
+        }
+      },
+      "PublicAccessType": {
+        "type": "string",
+        "enum": [
+          "container",
+          "blob"
+        ],
+        "x-ms-enum": {
+          "name": "PublicAccessType",
+          "modelAsString": true
+        }
+      },
+      "CopyStatus": {
+        "type": "string",
+        "enum": [
+          "pending",
+          "success",
+          "aborted",
+          "failed"
+        ],
+        "x-ms-enum": {
+          "name": "CopyStatusType",
+          "modelAsString": false
+        }
+      },
+      "LeaseDuration": {
+        "type": "string",
+        "enum": [
+          "infinite",
+          "fixed"
+        ],
+        "x-ms-enum": {
+          "name": "LeaseDurationType",
+          "modelAsString": false
+        }
+      },
+      "LeaseState": {
+        "type": "string",
+        "enum": [
+          "available",
+          "leased",
+          "expired",
+          "breaking",
+          "broken"
+        ],
+        "x-ms-enum": {
+          "name": "LeaseStateType",
+          "modelAsString": false
+        }
+      },
+      "LeaseStatus": {
+        "type": "string",
+        "enum": [
+          "locked",
+          "unlocked"
+        ],
+        "x-ms-enum": {
+          "name": "LeaseStatusType",
+          "modelAsString": false
+        }
+      },
+      "StorageError": {
+        "type": "object",
+        "properties": {
+          "Code": {
+            "type": "string"
+          },
+          "Message": {
+            "type": "string"
+          }
+        }
+      },
+      "AccessPolicy": {
+        "type": "object",
+        "required": [
+          "Start",
+          "Expiry",
+          "Permission"
+        ],
+        "description": "An Access policy",
+        "properties": {
+          "Start": {
+            "description": "the date-time the policy is active",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Expiry": {
+            "description": "the date-time the policy expires",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Permission": {
+            "description": "the permissions for the acl policy",
+            "type": "string"
+          }
+        }
+      },
+      "AccessTier": {
+        "type": "string",
+        "enum": [
+          "P4",
+          "P6",
+          "P10",
+          "P20",
+          "P30",
+          "P40",
+          "P50",
+          "Hot",
+          "Cool",
+          "Archive"
+        ],
+        "x-ms-enum": {
+          "name": "AccessTier",
+          "modelAsString": true
+        }
+      },
+      "ArchiveStatus": {
+        "type": "string",
+        "enum": [
+          "rehydrate-pending-to-hot",
+          "rehydrate-pending-to-cool"
+        ],
+        "x-ms-enum": {
+          "name": "ArchiveStatus",
+          "modelAsString": true
+        }
+      },
+      "BlobItem": {
+        "xml": {
+          "name": "Blob"
+        },
+        "description": "An Azure Storage blob",
+        "type": "object",
+        "required": [
+          "Name",
+          "Deleted",
+          "Snapshot",
+          "Properties"
+        ],
+        "properties": {
+          "Name": {
+            "type": "string"
+          },
+          "Deleted": {
+            "type": "boolean"
+          },
+          "Snapshot": {
+            "type": "string"
+          },
+          "Properties": {
+            "$ref": "#/definitions/BlobProperties"
+          },
+          "Metadata": {
+            "$ref": "#/definitions/Metadata"
+          }
+        }
+      },
+      "BlobProperties": {
+        "xml": {
+          "name": "Properties"
+        },
+        "description": "Properties of a blob",
+        "type": "object",
+        "required": [
+          "Etag",
+          "Last-Modified"
+        ],
+        "properties": {
+          "Creation-Time": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "Last-Modified": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "Etag": {
+            "type": "string",
+            "format": "etag"
+          },
+          "Content-Length": {
+            "type": "integer",
+            "format": "int64",
+            "description": "Size in bytes"
+          },
+          "Content-Type": {
+            "type": "string"
+          },
+          "Content-Encoding": {
+            "type": "string"
+          },
+          "Content-Language": {
+            "type": "string"
+          },
+          "Content-MD5": {
+            "type": "string",
+            "format": "byte"
+          },
+          "Content-Disposition": {
+            "type": "string"
+          },
+          "Cache-Control": {
+            "type": "string"
+          },
+          "x-ms-blob-sequence-number": {
+            "x-ms-client-name": "blobSequenceNumber",
+            "type": "integer",
+            "format": "int64"
+          },
+          "BlobType": {
+            "type": "string",
+            "enum": [
+              "BlockBlob",
+              "PageBlob",
+              "AppendBlob"
+            ],
+            "x-ms-enum": {
+              "name": "BlobType",
+              "modelAsString": false
+            }
+          },
+          "LeaseStatus": {
+            "$ref": "#/definitions/LeaseStatus"
+          },
+          "LeaseState": {
+            "$ref": "#/definitions/LeaseState"
+          },
+          "LeaseDuration": {
+            "$ref": "#/definitions/LeaseDuration"
+          },
+          "CopyId": {
+            "type": "string"
+          },
+          "CopyStatus": {
+            "$ref": "#/definitions/CopyStatus"
+          },
+          "CopySource": {
+            "type": "string"
+          },
+          "CopyProgress": {
+            "type": "string"
+          },
+          "CopyCompletionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "CopyStatusDescription": {
+            "type": "string"
+          },
+          "ServerEncrypted": {
+            "type": "boolean"
+          },
+          "IncrementalCopy": {
+            "type": "boolean"
+          },
+          "DestinationSnapshot": {
+            "type": "string"
+          },
+          "DeletedTime": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "RemainingRetentionDays": {
+            "type": "integer"
+          },
+          "AccessTier": {
+            "$ref": "#/definitions/AccessTier"
+          },
+          "AccessTierInferred": {
+            "type": "boolean"
+          },
+          "ArchiveStatus": {
+            "$ref": "#/definitions/ArchiveStatus"
+          },
+          "AccessTierChangeTime": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          }
+        }
+      },
+      "ListBlobsFlatSegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "An enumeration of blobs",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "ContainerName",
+          "Segment"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "ContainerName": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "Delimiter": {
+            "type": "string"
+          },
+          "Segment": {
+            "$ref": "#/definitions/BlobFlatListSegment"
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "ListBlobsHierarchySegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "An enumeration of blobs",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "ContainerName",
+          "Segment"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "ContainerName": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "Delimiter": {
+            "type": "string"
+          },
+          "Segment": {
+            "$ref": "#/definitions/BlobHierarchyListSegment"
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "BlobFlatListSegment": {
+        "xml": {
+          "name": "Blobs"
+        },
+        "required": [
+          "BlobItems"
+        ],
+        "type": "object",
+        "properties": {
+          "BlobItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/BlobItem"
+            }
+          }
+        }
+      },
+      "BlobHierarchyListSegment": {
+        "xml": {
+          "name": "Blobs"
+        },
+        "type": "object",
+        "required": [
+          "BlobItems"
+        ],
+        "properties": {
+          "BlobPrefixes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/BlobPrefix"
+            }
+          },
+          "BlobItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/BlobItem"
+            }
+          }
+        }
+      },
+      "BlobPrefix": {
+        "type": "object",
+        "required": [
+          "Name"
+        ],
+        "properties": {
+          "Name": {
+            "type": "string"
+          }
+        }
+      },
+      "Block": {
+        "type": "object",
+        "required": [
+          "Name",
+          "Size"
+        ],
+        "description": "Represents a single block in a block blob.  It describes the block's ID and size.",
+        "properties": {
+          "Name": {
+            "description": "The base64 encoded block ID.",
+            "type": "string"
+          },
+          "Size": {
+            "description": "The block size in bytes.",
+            "type": "integer"
+          }
+        }
+      },
+      "BlockList": {
+        "type": "object",
+        "properties": {
+          "CommittedBlocks": {
+            "xml": {
+              "wrapped": true
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/Block"
+            }
+          },
+          "UncommittedBlocks": {
+            "xml": {
+              "wrapped": true
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/Block"
+            }
+          }
+        }
+      },
+      "BlockLookupList": {
+        "type": "object",
+        "properties": {
+          "Committed": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "xml": {
+                "name": "Committed"
+              }
+            }
+          },
+          "Uncommitted": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "xml": {
+                "name": "Uncommitted"
+              }
+            }
+          },
+          "Latest": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "xml": {
+                "name": "Latest"
+              }
+            }
+          }
+        },
+        "xml": {
+          "name": "BlockList"
+        }
+      },
+      "ContainerItem": {
+        "xml": {
+          "name": "Container"
+        },
+        "type": "object",
+        "required": [
+          "Name",
+          "Properties"
+        ],
+        "description": "An Azure Storage container",
+        "properties": {
+          "Name": {
+            "type": "string"
+          },
+          "Properties": {
+            "$ref": "#/definitions/ContainerProperties"
+          },
+          "Metadata": {
+            "$ref": "#/definitions/Metadata"
+          }
+        }
+      },
+      "ContainerProperties": {
+        "type": "object",
+        "required": [
+          "Last-Modified",
+          "Etag"
+        ],
+        "description": "Properties of a container",
+        "properties": {
+          "Last-Modified": {
+            "type": "string",
+            "format": "date-time-rfc1123"
+          },
+          "Etag": {
+            "type": "string",
+            "format": "etag"
+          },
+          "LeaseStatus": {
+            "$ref": "#/definitions/LeaseStatus"
+          },
+          "LeaseState": {
+            "$ref": "#/definitions/LeaseState"
+          },
+          "LeaseDuration": {
+            "$ref": "#/definitions/LeaseDuration"
+          },
+          "PublicAccess": {
+            "$ref": "#/definitions/PublicAccessType"
+          },
+          "HasImmutabilityPolicy": {
+            "type": "boolean"
+          },
+          "HasLegalHold": {
+            "type": "boolean"
+          }
+        }
+      },
+      "ListContainersSegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "An enumeration of containers",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "ContainerItems"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "ContainerItems": {
+            "xml": {
+              "wrapped": true,
+              "name": "Containers"
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/ContainerItem"
+            }
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "CorsRule": {
+        "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
+        "type": "object",
+        "required": [
+          "AllowedOrigins",
+          "AllowedMethods",
+          "AllowedHeaders",
+          "ExposedHeaders",
+          "MaxAgeInSeconds"
+        ],
+        "properties": {
+          "AllowedOrigins": {
+            "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
+            "type": "string"
+          },
+          "AllowedMethods": {
+            "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
+            "type": "string"
+          },
+          "AllowedHeaders": {
+            "description": "the request headers that the origin domain may specify on the CORS request.",
+            "type": "string"
+          },
+          "ExposedHeaders": {
+            "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
+            "type": "string"
+          },
+          "MaxAgeInSeconds": {
+            "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+            "type": "integer",
+            "minimum": 0
+          }
+        }
+      },
+      "ErrorCode": {
+        "description": "Error codes returned by the service",
+        "type": "string",
+        "enum": [
+          "AccountAlreadyExists",
+          "AccountBeingCreated",
+          "AccountIsDisabled",
+          "AuthenticationFailed",
+          "AuthorizationFailure",
+          "ConditionHeadersNotSupported",
+          "ConditionNotMet",
+          "EmptyMetadataKey",
+          "InsufficientAccountPermissions",
+          "InternalError",
+          "InvalidAuthenticationInfo",
+          "InvalidHeaderValue",
+          "InvalidHttpVerb",
+          "InvalidInput",
+          "InvalidMd5",
+          "InvalidMetadata",
+          "InvalidQueryParameterValue",
+          "InvalidRange",
+          "InvalidResourceName",
+          "InvalidUri",
+          "InvalidXmlDocument",
+          "InvalidXmlNodeValue",
+          "Md5Mismatch",
+          "MetadataTooLarge",
+          "MissingContentLengthHeader",
+          "MissingRequiredQueryParameter",
+          "MissingRequiredHeader",
+          "MissingRequiredXmlNode",
+          "MultipleConditionHeadersNotSupported",
+          "OperationTimedOut",
+          "OutOfRangeInput",
+          "OutOfRangeQueryParameterValue",
+          "RequestBodyTooLarge",
+          "ResourceTypeMismatch",
+          "RequestUrlFailedToParse",
+          "ResourceAlreadyExists",
+          "ResourceNotFound",
+          "ServerBusy",
+          "UnsupportedHeader",
+          "UnsupportedXmlNode",
+          "UnsupportedQueryParameter",
+          "UnsupportedHttpVerb",
+          "AppendPositionConditionNotMet",
+          "BlobAlreadyExists",
+          "BlobNotFound",
+          "BlobOverwritten",
+          "BlobTierInadequateForContentLength",
+          "BlockCountExceedsLimit",
+          "BlockListTooLong",
+          "CannotChangeToLowerTier",
+          "CannotVerifyCopySource",
+          "ContainerAlreadyExists",
+          "ContainerBeingDeleted",
+          "ContainerDisabled",
+          "ContainerNotFound",
+          "ContentLengthLargerThanTierLimit",
+          "CopyAcrossAccountsNotSupported",
+          "CopyIdMismatch",
+          "FeatureVersionMismatch",
+          "IncrementalCopyBlobMismatch",
+          "IncrementalCopyOfEralierVersionSnapshotNotAllowed",
+          "IncrementalCopySourceMustBeSnapshot",
+          "InfiniteLeaseDurationRequired",
+          "InvalidBlobOrBlock",
+          "InvalidBlobTier",
+          "InvalidBlobType",
+          "InvalidBlockId",
+          "InvalidBlockList",
+          "InvalidOperation",
+          "InvalidPageRange",
+          "InvalidSourceBlobType",
+          "InvalidSourceBlobUrl",
+          "InvalidVersionForPageBlobOperation",
+          "LeaseAlreadyPresent",
+          "LeaseAlreadyBroken",
+          "LeaseIdMismatchWithBlobOperation",
+          "LeaseIdMismatchWithContainerOperation",
+          "LeaseIdMismatchWithLeaseOperation",
+          "LeaseIdMissing",
+          "LeaseIsBreakingAndCannotBeAcquired",
+          "LeaseIsBreakingAndCannotBeChanged",
+          "LeaseIsBrokenAndCannotBeRenewed",
+          "LeaseLost",
+          "LeaseNotPresentWithBlobOperation",
+          "LeaseNotPresentWithContainerOperation",
+          "LeaseNotPresentWithLeaseOperation",
+          "MaxBlobSizeConditionNotMet",
+          "NoPendingCopyOperation",
+          "OperationNotAllowedOnIncrementalCopyBlob",
+          "PendingCopyOperation",
+          "PreviousSnapshotCannotBeNewer",
+          "PreviousSnapshotNotFound",
+          "PreviousSnapshotOperationNotSupported",
+          "SequenceNumberConditionNotMet",
+          "SequenceNumberIncrementTooLarge",
+          "SnapshotCountExceeded",
+          "SnaphotOperationRateExceeded",
+          "SnapshotsPresent",
+          "SourceConditionNotMet",
+          "SystemInUse",
+          "TargetConditionNotMet",
+          "UnauthorizedBlobOverwrite",
+          "BlobBeingRehydrated",
+          "BlobArchived",
+          "BlobNotArchived"
+        ],
+        "x-ms-enum": {
+          "name": "StorageErrorCode",
+          "modelAsString": true
+        }
+      },
+      "GeoReplication": {
+        "description": "Geo-Replication information for the Secondary Storage Service",
+        "type": "object",
+        "required": [
+          "Status",
+          "LastSyncTime"
+        ],
+        "properties": {
+          "Status": {
+            "description": "The status of the secondary location",
+            "type": "string",
+            "enum": [
+              "live",
+              "bootstrap",
+              "unavailable"
+            ],
+            "x-ms-enum": {
+              "name": "GeoReplicationStatusType",
+              "modelAsString": true
+            }
+          },
+          "LastSyncTime": {
+            "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
+            "type": "string",
+            "format": "date-time-rfc1123"
+          }
+        }
+      },
+      "Logging": {
+        "description": "Azure Analytics Logging settings.",
+        "type": "object",
+        "required": [
+          "Version",
+          "Delete",
+          "Read",
+          "Write",
+          "RetentionPolicy"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Delete": {
+            "description": "Indicates whether all delete requests should be logged.",
+            "type": "boolean"
+          },
+          "Read": {
+            "description": "Indicates whether all read requests should be logged.",
+            "type": "boolean"
+          },
+          "Write": {
+            "description": "Indicates whether all write requests should be logged.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "Metadata": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "string"
+        }
+      },
+      "Metrics": {
+        "description": "a summary of request statistics grouped by API in hour or minute aggregates for blobs",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Enabled": {
+            "description": "Indicates whether metrics are enabled for the Blob service.",
+            "type": "boolean"
+          },
+          "IncludeAPIs": {
+            "description": "Indicates whether metrics should generate summary statistics for called API operations.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "PageList": {
+        "description": "the list of pages",
+        "type": "object",
+        "properties": {
+          "PageRange": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/PageRange"
+            }
+          },
+          "ClearRange": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/ClearRange"
+            }
+          }
+        }
+      },
+      "PageRange": {
+        "type": "object",
+        "required": [
+          "Start",
+          "End"
+        ],
+        "properties": {
+          "Start": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "Start"
+            }
+          },
+          "End": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "End"
+            }
+          }
+        },
+        "xml": {
+          "name": "PageRange"
+        }
+      },
+      "ClearRange": {
+        "type": "object",
+        "required": [
+          "Start",
+          "End"
+        ],
+        "properties": {
+          "Start": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "Start"
+            }
+          },
+          "End": {
+            "type": "integer",
+            "format": "int64",
+            "xml": {
+              "name": "End"
+            }
+          }
+        },
+        "xml": {
+          "name": "ClearRange"
+        }
+      },
+      "RetentionPolicy": {
+        "description": "the retention policy which determines how long the associated data should persist",
+        "type": "object",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Enabled": {
+            "description": "Indicates whether a retention policy is enabled for the storage service",
+            "type": "boolean"
+          },
+          "Days": {
+            "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
+            "type": "integer",
+            "minimum": 1
+          }
+        }
+      },
+      "SignedIdentifier": {
+        "xml": {
+          "name": "SignedIdentifier"
+        },
+        "description": "signed identifier",
+        "type": "object",
+        "required": [
+          "Id",
+          "AccessPolicy"
+        ],
+        "properties": {
+          "Id": {
+            "type": "string",
+            "description": "a unique id"
+          },
+          "AccessPolicy": {
+            "$ref": "#/definitions/AccessPolicy"
+          }
+        }
+      },
+      "SignedIdentifiers": {
+        "description": "a collection of signed identifiers",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/SignedIdentifier"
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "SignedIdentifiers"
+        }
+      },
+      "StaticWebsite": {
+        "description": "The properties that enable an account to host a static website",
+        "type": "object",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Enabled": {
+            "description": "Indicates whether this account is hosting a static website",
+            "type": "boolean"
+          },
+          "IndexDocument": {
+            "description": "The default name of the index page under each directory",
+            "type": "string"
+          },
+          "ErrorDocument404Path": {
+            "description": "The absolute path of the custom 404 page",
+            "type": "string"
+          }
+        }
+      },
+      "StorageServiceProperties": {
+        "description": "Storage Service Properties.",
+        "type": "object",
+        "properties": {
+          "Logging": {
+            "$ref": "#/definitions/Logging"
+          },
+          "HourMetrics": {
+            "$ref": "#/definitions/Metrics"
+          },
+          "MinuteMetrics": {
+            "$ref": "#/definitions/Metrics"
+          },
+          "Cors": {
+            "description": "The set of CORS rules.",
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/CorsRule"
+            },
+            "xml": {
+              "wrapped": true
+            }
+          },
+          "DefaultServiceVersion": {
+            "description": "The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions",
+            "type": "string"
+          },
+          "DeleteRetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          },
+          "StaticWebsite": {
+            "$ref": "#/definitions/StaticWebsite"
+          }
+        }
+      },
+      "StorageServiceStats": {
+        "description": "Stats for the storage service.",
+        "type": "object",
+        "properties": {
+          "GeoReplication": {
+            "$ref": "#/definitions/GeoReplication"
+          }
+        }
+      }
+    },
+    "parameters": {
+      "Url": {
+        "name": "url",
+        "description": "The URL of the service account, container, or blob that is the targe of the desired operation.",
+        "required": true,
+        "type": "string",
+        "in": "path",
+        "x-ms-skip-url-encoding": true
+      },
+      "ApiVersionParameter": {
+        "name": "x-ms-version",
+        "x-ms-client-name": "version",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "description": "Specifies the version of the operation to use for this request.",
+        "enum": [
+          "2018-11-09"
+        ]
+      },
+      "Blob": {
+        "name": "blob",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "pattern": "^[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+)*(?:\\.[a-zA-Z0-9]+){0,1}$",
+        "minLength": 1,
+        "maxLength": 1024,
+        "x-ms-parameter-location": "method",
+        "description": "The blob name."
+      },
+      "BlobCacheControl": {
+        "name": "x-ms-blob-cache-control",
+        "x-ms-client-name": "blobCacheControl",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's cache control. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobConditionAppendPos": {
+        "name": "x-ms-blob-condition-appendpos",
+        "x-ms-client-name": "appendPosition",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "append-position-access-conditions"
+        },
+        "description": "Optional conditional header, used only for the Append Block operation. A number indicating the byte offset to compare. Append Block will succeed only if the append position is equal to this number. If it is not, the request will fail with the AppendPositionConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+      },
+      "BlobConditionMaxSize": {
+        "name": "x-ms-blob-condition-maxsize",
+        "x-ms-client-name": "maxSize",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "append-position-access-conditions"
+        },
+        "description": "Optional conditional header. The max length in bytes permitted for the append blob. If the Append Block operation would cause the blob to exceed that limit or if the blob size is already greater than the value specified in this header, the request will fail with MaxBlobSizeConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+      },
+      "BlobPublicAccess": {
+        "name": "x-ms-blob-public-access",
+        "x-ms-client-name": "access",
+        "in": "header",
+        "required": false,
+        "x-ms-parameter-location": "method",
+        "description": "Specifies whether data in the container may be accessed publicly and the level of access",
+        "type": "string",
+        "enum": [
+          "container",
+          "blob"
+        ],
+        "x-ms-enum": {
+          "name": "PublicAccessType",
+          "modelAsString": true
+        }
+      },
+      "AccessTier": {
+        "name": "x-ms-access-tier",
+        "x-ms-client-name": "tier",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "enum": [
+          "P4",
+          "P6",
+          "P10",
+          "P20",
+          "P30",
+          "P40",
+          "P50",
+          "Hot",
+          "Cool",
+          "Archive"
+        ],
+        "x-ms-enum": {
+          "name": "AccessTier",
+          "modelAsString": true
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Indicates the tier to be set on the blob."
+      },
+      "BlobContentDisposition": {
+        "name": "x-ms-blob-content-disposition",
+        "x-ms-client-name": "blobContentDisposition",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's Content-Disposition header."
+      },
+      "BlobContentEncoding": {
+        "name": "x-ms-blob-content-encoding",
+        "x-ms-client-name": "blobContentEncoding",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's content encoding. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobContentLanguage": {
+        "name": "x-ms-blob-content-language",
+        "x-ms-client-name": "blobContentLanguage",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Set the blob's content language. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobContentLengthOptional": {
+        "name": "x-ms-blob-content-length",
+        "x-ms-client-name": "blobContentLength",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+      },
+      "BlobContentLengthRequired": {
+        "name": "x-ms-blob-content-length",
+        "x-ms-client-name": "blobContentLength",
+        "in": "header",
+        "required": true,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+      },
+      "BlobContentMD5": {
+        "name": "x-ms-blob-content-md5",
+        "x-ms-client-name": "blobContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "byte",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded."
+      },
+      "BlobContentType": {
+        "name": "x-ms-blob-content-type",
+        "x-ms-client-name": "blobContentType",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "blob-HTTP-headers"
+        },
+        "description": "Optional. Sets the blob's content type. If specified, this property is stored with the blob and returned with a read request."
+      },
+      "BlobSequenceNumber": {
+        "name": "x-ms-blob-sequence-number",
+        "x-ms-client-name": "blobSequenceNumber",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "default": 0,
+        "x-ms-parameter-location": "method",
+        "description": "Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1."
+      },
+      "BlockId": {
+        "name": "blockid",
+        "x-ms-client-name": "blockId",
+        "in": "query",
+        "type": "string",
+        "required": true,
+        "x-ms-parameter-location": "method",
+        "description": "A valid Base64 string value that identifies the block. Prior to encoding, the string must be less than or equal to 64 bytes in size. For a given blob, the length of the value specified for the blockid parameter must be the same size for each block."
+      },
+      "BlockListType": {
+        "name": "blocklisttype",
+        "x-ms-client-name": "listType",
+        "in": "query",
+        "required": true,
+        "default": "committed",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies whether to return the list of committed blocks, the list of uncommitted blocks, or both lists together.",
+        "type": "string",
+        "enum": [
+          "committed",
+          "uncommitted",
+          "all"
+        ],
+        "x-ms-enum": {
+          "name": "BlockListType",
+          "modelAsString": false
+        }
+      },
+      "Body": {
+        "name": "body",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "type": "object",
+          "format": "file"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Initial data"
+      },
+      "ContainerAcl": {
+        "name": "containerAcl",
+        "in": "body",
+        "schema": {
+          "$ref": "#/definitions/SignedIdentifiers"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "the acls for the container"
+      },
+      "CopyId": {
+        "name": "copyid",
+        "x-ms-client-name": "copyId",
+        "in": "query",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The copy identifier provided in the x-ms-copy-id header of the original Copy Blob operation."
+      },
+      "ClientRequestId": {
+        "name": "x-ms-client-request-id",
+        "x-ms-client-name": "requestId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled."
+      },
+      "ContainerName": {
+        "name": "containerName",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The container name."
+      },
+  
+      "ContentLength": {
+        "name": "Content-Length",
+        "in": "header",
+        "required": true,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "The length of the request."
+      },
+      "ContentMD5": {
+        "name": "Content-MD5",
+        "x-ms-client-name": "transactionalContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "byte",
+        "x-ms-parameter-location": "method",
+        "description": "Specify the transactional md5 for the body, to be validated by the service."
+      },
+      "CopySource": {
+        "name": "x-ms-copy-source",
+        "x-ms-client-name": "copySource",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "format": "url",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature."
+      },
+      "DeleteSnapshots": {
+        "name": "x-ms-delete-snapshots",
+        "x-ms-client-name": "deleteSnapshots",
+        "description": "Required if the blob has associated snapshots. Specify one of the following two options: include: Delete the base blob and all of its snapshots. only: Delete only the blob's snapshots and not the blob itself",
+        "x-ms-parameter-location": "method",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "enum": [
+          "include",
+          "only"
+        ],
+        "x-ms-enum": {
+          "name": "DeleteSnapshotsOptionType",
+          "modelAsString": false
+        }
+      },
+      "Delimiter": {
+        "name": "delimiter",
+        "description": "When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.",
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "in": "query",
+        "required": true
+      },
+      "GetRangeContentMD5": {
+        "name": "x-ms-range-get-content-md5",
+        "x-ms-client-name": "rangeGetContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "boolean",
+        "x-ms-parameter-location": "method",
+        "description": "When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size."
+      },
+      "IfMatch": {
+        "name": "If-Match",
+        "x-ms-client-name": "ifMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs with a matching value."
+      },
+      "IfModifiedSince": {
+        "name": "If-Modified-Since",
+        "x-ms-client-name": "ifModifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+      },
+      "IfNoneMatch": {
+        "name": "If-None-Match",
+        "x-ms-client-name": "ifNoneMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs without a matching value."
+      },
+      "IfUnmodifiedSince": {
+        "name": "If-Unmodified-Since",
+        "x-ms-client-name": "ifUnmodifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+      },
+      "IfSequenceNumberEqualTo": {
+        "name": "x-ms-if-sequence-number-eq",
+        "x-ms-client-name": "ifSequenceNumberEqualTo",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "sequence-number-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has the specified sequence number."
+      },
+      "IfSequenceNumberLessThan": {
+        "name": "x-ms-if-sequence-number-lt",
+        "x-ms-client-name": "ifSequenceNumberLessThan",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "sequence-number-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has a sequence number less than the specified."
+      },
+      "IfSequenceNumberLessThanOrEqualTo": {
+        "name": "x-ms-if-sequence-number-le",
+        "x-ms-client-name": "ifSequenceNumberLessThanOrEqualTo",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "sequence-number-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has a sequence number less than or equal to the specified."
+      },
+      "KeyInfo": {
+        "name": "KeyInfo",
+        "in": "body",
+        "x-ms-parameter-location": "method",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/KeyInfo"
+        }
+      },
+      "ListBlobsInclude": {
+        "name": "include",
+        "in": "query",
+        "required": false,
+        "type": "array",
+        "collectionFormat": "csv",
+        "items": {
+          "type": "string",
+          "enum": [
+            "copy",
+            "deleted",
+            "metadata",
+            "snapshots",
+            "uncommittedblobs"
+          ],
+          "x-ms-enum": {
+            "name": "ListBlobsIncludeItem",
+            "modelAsString": false
+          }
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Include this parameter to specify one or more datasets to include in the response."
+      },
+      "ListContainersInclude": {
+        "name": "include",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "enum": [
+          "metadata"
+        ],
+        "x-ms-enum": {
+          "name": "ListContainersIncludeType",
+          "modelAsString": false
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Include this parameter to specify that the container's metadata be returned as part of the response body."
+      },
+      "LeaseBreakPeriod": {
+        "name": "x-ms-lease-break-period",
+        "x-ms-client-name": "breakPeriod",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "x-ms-parameter-location": "method",
+        "description": "For a break operation, proposed duration the lease should continue before it is broken, in seconds, between 0 and 60. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately."
+      },
+      "LeaseDuration": {
+        "name": "x-ms-lease-duration",
+        "x-ms-client-name": "duration",
+        "in": "header",
+        "required": false,
+        "type": "integer",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change."
+      },
+      "LeaseIdOptional": {
+        "name": "x-ms-lease-id",
+        "x-ms-client-name": "leaseId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "lease-access-conditions"
+        },
+        "description": "If specified, the operation only succeeds if the resource's lease is active and matches this ID."
+      },
+      "LeaseIdRequired": {
+        "name": "x-ms-lease-id",
+        "x-ms-client-name": "leaseId",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the current lease ID on the resource."
+      },
+      "Marker": {
+        "name": "marker",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
+        "x-ms-parameter-location": "method"
+      },
+      "MaxResults": {
+        "name": "maxresults",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 1,
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
+      },
+      "Metadata": {
+        "name": "x-ms-meta",
+        "x-ms-client-name": "metadata",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.",
+        "x-ms-header-collection-prefix": "x-ms-meta-"
+      },
+      "Prefix": {
+        "name": "prefix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "Filters the results to return only containers whose name begins with the specified prefix.",
+        "x-ms-parameter-location": "method"
+      },
+      "PrevSnapshot": {
+        "name": "prevsnapshot",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Optional in version 2015-07-08 and newer. The prevsnapshot parameter is a DateTime value that specifies that the response will contain only pages that were changed between target blob and previous snapshot. Changed pages include both updated and cleared pages. The target blob may be a snapshot, as long as the snapshot specified by prevsnapshot is the older of the two. Note that incremental snapshots are currently supported only for blobs created on or after January 1, 2016."
+      },
+      "ProposedLeaseIdOptional": {
+        "name": "x-ms-proposed-lease-id",
+        "x-ms-client-name": "proposedLeaseId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+      },
+      "ProposedLeaseIdRequired": {
+        "name": "x-ms-proposed-lease-id",
+        "x-ms-client-name": "proposedLeaseId",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+      },
+      "Range": {
+        "name": "x-ms-range",
+        "x-ms-client-name": "range",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Return only the bytes of the blob in the specified range."
+      },
+      "RangeRequiredPutPageFromUrl": {
+        "name": "x-ms-range",
+        "x-ms-client-name": "range",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required."
+      },
+      "SequenceNumberAction": {
+        "name": "x-ms-sequence-number-action",
+        "x-ms-client-name": "sequenceNumberAction",
+        "in": "header",
+        "required": true,
+        "x-ms-parameter-location": "method",
+        "description": "Required if the x-ms-blob-sequence-number header is set for the request. This property applies to page blobs only. This property indicates how the service should modify the blob's sequence number",
+        "type": "string",
+        "enum": [
+          "max",
+          "update",
+          "increment"
+        ],
+        "x-ms-enum": {
+          "name": "SequenceNumberActionType",
+          "modelAsString": false
+        }
+      },
+      "Snapshot": {
+        "name": "snapshot",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob\">Creating a Snapshot of a Blob.</a>"
+      },
+      "SourceContentMD5": {
+        "name": "x-ms-source-content-md5",
+        "x-ms-client-name": "sourceContentMD5",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "byte",
+        "x-ms-parameter-location": "method",
+        "description": "Specify the md5 calculated for the range of bytes that must be read from the copy source."
+      },
+      "SourceRange": {
+        "name": "x-ms-source-range",
+        "x-ms-client-name": "sourceRange",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Bytes of source data in the specified range."
+        },
+        "SourceRangeRequiredPutPageFromUrl": {
+          "name": "x-ms-source-range",
+          "x-ms-client-name": "sourceRange",
+          "in": "header",
+          "required": true,
+          "type": "string",
+          "x-ms-parameter-location": "method",
+          "description": "Bytes of source data in the specified range. The length of this range should match the ContentLength header and x-ms-range/Range destination range header."
+      },
+      "SourceIfMatch": {
+        "name": "x-ms-source-if-match",
+        "x-ms-client-name": "sourceIfMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs with a matching value."
+      },
+      "SourceIfModifiedSince": {
+        "name": "x-ms-source-if-modified-since",
+        "x-ms-client-name": "sourceIfModifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+      },
+      "SourceIfNoneMatch": {
+        "name": "x-ms-source-if-none-match",
+        "x-ms-client-name": "sourceIfNoneMatch",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "etag",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify an ETag value to operate only on blobs without a matching value."
+      },
+      "SourceIfUnmodifiedSince": {
+        "name": "x-ms-source-if-unmodified-since",
+        "x-ms-client-name": "sourceIfUnmodifiedSince",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "format": "date-time-rfc1123",
+        "x-ms-parameter-location": "method",
+        "x-ms-parameter-grouping": {
+          "name": "source-modified-access-conditions"
+        },
+        "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+      },
+        "SourceLeaseId": {
+          "name": "x-ms-source-lease-id",
+          "x-ms-client-name": "sourceLeaseId",
+          "in": "header",
+          "required": false,
+          "type": "string",
+          "x-ms-parameter-location": "method",
+          "description": "A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match."
+        },
+      "SourceUrl": {
+        "name": "x-ms-copy-source",
+        "x-ms-client-name": "sourceUrl",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "format": "url",
+        "x-ms-parameter-location": "method",
+        "description": "Specify a URL to the copy source."
+      },
+      "StorageServiceProperties": {
+        "name": "StorageServiceProperties",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/StorageServiceProperties"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "The StorageService properties."
+      },
+      "Timeout": {
+        "name": "timeout",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 0,
+        "x-ms-parameter-location": "method",
+        "description": "The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations\">Setting Timeouts for Blob Service Operations.</a>"
+        }
+    }
+  }
+  
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/swagger/blob-2019-02-02.json b/sdk/storage/azure-storage-blob/swagger/blob-2019-02-02.json
new file mode 100644
index 000000000000..18ae16c45ec5
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/swagger/blob-2019-02-02.json
@@ -0,0 +1,9974 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Azure Blob Storage",
+    "version": "2019-02-02",
+    "x-ms-code-generation-settings": {
+      "header": "MIT",
+      "strictSpecAdherence": false
+    }
+  },
+  "x-ms-parameterized-host": {
+    "hostTemplate": "{url}",
+    "useSchemePrefix": false,
+    "positionInOperation": "first",
+    "parameters": [
+      {
+        "$ref": "#/parameters/Url"
+      }
+    ]
+  },
+  "securityDefinitions": {
+    "blob_shared_key": {
+      "type": "apiKey",
+      "name": "Authorization",
+      "in": "header"
+    }
+  },
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/xml",
+    "application/octet-stream",
+    "text/plain"
+  ],
+  "produces": [
+    "application/xml",
+    "application/octet-stream",
+    "text/plain"
+  ],
+  "paths": {},
+    "x-ms-paths": {
+        "/?restype=service&comp=properties": {
+            "put": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_SetProperties",
+                "description": "Sets properties for a storage account's Blob service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/StorageServiceProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "Success (Accepted)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetProperties",
+                "description": "gets the properties of a storage account's Blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageServiceProperties"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "service"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/?restype=service&comp=stats": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetStatistics",
+                "description": "Retrieves statistics related to replication for the Blob service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageServiceStats"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "service"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "stats"
+                    ]
+                }
+            ]
+        },
+        "/?comp=list": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_ListContainersSegment",
+                "description": "The List Containers Segment operation returns a list of the containers under the specified account",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Prefix"
+                    },
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/ListContainersInclude"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/ListContainersSegmentResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "NextMarker"
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "list"
+                    ]
+                }
+            ]
+        },
+        "/?restype=service&comp=userdelegationkey": {
+            "post": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetUserDelegationKey",
+                "description": "Retrieves a user delgation key for the Blob service. This is only a valid operation when using bearer token authentication.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/KeyInfo"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/UserDelegationKey"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "service"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "userdelegationkey"
+                    ]
+                }
+            ]
+        },
+        "/?restype=account&comp=properties": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_GetAccountInfo",
+                "description": "Returns the sku name and account kind ",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success (OK)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-sku-name": {
+                                "x-ms-client-name": "SkuName",
+                                "type": "string",
+                                "enum": [
+                                    "Standard_LRS",
+                                    "Standard_GRS",
+                                    "Standard_RAGRS",
+                                    "Standard_ZRS",
+                                    "Premium_LRS"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SkuName",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the sku name of the account"
+                            },
+                            "x-ms-account-kind": {
+                                "x-ms-client-name": "AccountKind",
+                                "type": "string",
+                                "enum": [
+                                    "Storage",
+                                    "BlobStorage",
+                                    "StorageV2"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "AccountKind",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the account kind"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "account"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/?comp=blobs": {
+            "get": {
+                "tags": [
+                    "service"
+                ],
+                "operationId": "Service_FilterBlobs",
+                "description": "The Filter Blobs operation enables callers to list blobs in an account whose tags match a given search expression.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagFilter"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Filter Blobs this is 'application/xml'"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/FilterBlobsResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "blobs"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_Create",
+                "description": "creates a new container under the specified account. If the container with the same name already exists, the operation fails",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobPublicAccess"
+                    },
+                    {
+                        "$ref": "#/parameters/DefaultEncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/DenyEncryptionScopeOverride"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "Success, Container created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_GetProperties",
+                "description": "returns all user-defined metadata and system properties for the specified container. The data returned does not include the container's list of blobs",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "headers": {
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-public-access": {
+                                "x-ms-client-name": "BlobPublicAccess",
+                                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                                "type": "string",
+                                "enum": [
+                                    "container",
+                                    "blob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "PublicAccessType",
+                                    "modelAsString": true
+                                }
+                            },
+                            "x-ms-default-encryption-scope": {
+                                "x-ms-client-name": "DefaultEncryptionScope",
+                                "type": "string",
+                                "description": "Default encryption scope on this container"
+                            },
+                            "x-ms-deny-encryption-scope-override": {
+                                "x-ms-client-name": "DenyEncryptionScopeOverride",
+                                "type": "boolean",
+                                "description": "Whether to reject the write request with encryption scope"
+                            },
+                            "x-ms-has-immutability-policy": {
+                                "x-ms-client-name": "HasImmutabilityPolicy",
+                                "description": "Indicates whether the container has an immutability policy set on it.",
+                                "type": "boolean"
+                            },
+                            "x-ms-has-legal-hold": {
+                                "x-ms-client-name": "HasLegalHold",
+                                "description": "Indicates whether the container has a legal hold.",
+                                "type": "boolean"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_Delete",
+                "description": "operation marks the specified container for deletion. The container and any blobs contained within it are later deleted during garbage collection",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "Accepted",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=metadata": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_SetMetadata",
+                "description": "operation sets one or more user-defined name-value pairs for the specified container.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "metadata"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=acl": {
+            "get": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_GetAccessPolicy",
+                "description": "gets the permissions for the specified container. The permissions indicate whether container data may be accessed publicly.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "headers": {
+                            "x-ms-blob-public-access": {
+                                "x-ms-client-name": "BlobPublicAccess",
+                                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
+                                "type": "string",
+                                "enum": [
+                                    "container",
+                                    "blob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "PublicAccessType",
+                                    "modelAsString": true
+                                }
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/SignedIdentifiers"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_SetAccessPolicy",
+                "description": "sets the permissions for the specified container. The permissions indicate whether blobs in a container may be accessed publicly.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ContainerAcl"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobPublicAccess"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "acl"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&acquire": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_AcquireLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseDuration"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The Acquire operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a container's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "acquire"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&release": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_ReleaseLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Release operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "release"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&renew": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_RenewLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Renew operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a container's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "renew"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&break": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_BreakLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseBreakPeriod"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The Break operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-time": {
+                                "x-ms-client-name": "LeaseTime",
+                                "type": "integer",
+                                "description": "Approximate time remaining in the lease period, in seconds."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "break"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?comp=lease&restype=container&change": {
+            "put": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_ChangeLease",
+                "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Change operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a container's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "change"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=list&flat": {
+            "get": {
+                "tags": [
+                    "containers"
+                ],
+                "operationId": "Container_ListBlobFlatSegment",
+                "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Prefix"
+                    },
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/ListBlobsInclude"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/ListBlobsFlatSegmentResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "NextMarker"
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "list"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=container&comp=list&hierarchy": {
+            "get": {
+                "tags": [
+                    "containers"
+                ],
+                "operationId": "Container_ListBlobHierarchySegment",
+                "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Prefix"
+                    },
+                    {
+                        "$ref": "#/parameters/Delimiter"
+                    },
+                    {
+                        "$ref": "#/parameters/Marker"
+                    },
+                    {
+                        "$ref": "#/parameters/MaxResults"
+                    },
+                    {
+                        "$ref": "#/parameters/ListBlobsInclude"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success.",
+                        "headers": {
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/ListBlobsHierarchySegmentResponse"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "NextMarker"
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "container"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "list"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}?restype=account&comp=properties": {
+            "get": {
+                "tags": [
+                    "container"
+                ],
+                "operationId": "Container_GetAccountInfo",
+                "description": "Returns the sku name and account kind ",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success (OK)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-sku-name": {
+                                "x-ms-client-name": "SkuName",
+                                "type": "string",
+                                "enum": [
+                                    "Standard_LRS",
+                                    "Standard_GRS",
+                                    "Standard_RAGRS",
+                                    "Standard_ZRS",
+                                    "Premium_LRS"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SkuName",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the sku name of the account"
+                            },
+                            "x-ms-account-kind": {
+                                "x-ms-client-name": "AccountKind",
+                                "type": "string",
+                                "enum": [
+                                    "Storage",
+                                    "BlobStorage",
+                                    "StorageV2"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "AccountKind",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the account kind"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "account"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{filesystem}/{path}?resource=directory&Create": {
+            "put": {
+                "tags": [
+                    "directory"
+                ],
+                "operationId": "Directory_Create",
+                "description": "Create a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: \"*\".",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/DirectoryProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixPermissions"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixUmask"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The file or directory was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "An HTTP entity tag associated with the file or directory."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The data and time the file or directory was last modified. Write operations on the file or directory update the last modified time."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the resource in bytes."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "resource",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "directory"
+                    ]
+                }
+            ]
+        },
+        "/{filesystem}/{path}?DirectoryRename": {
+            "put": {
+                "tags": [
+                    "directory"
+                ],
+                "operationId": "Directory_Rename",
+                "description": "Rename a directory. By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken. This operation supports conditional HTTP requests. For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations). To fail if the destination already exists, use a conditional request with If-None-Match: \"*\".",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Continuation"
+                    },
+                    {
+                        "$ref": "#/parameters/PathRenameMode"
+                    },
+                    {
+                        "$ref": "#/parameters/FileRenameSource"
+                    },
+                    {
+                        "$ref": "#/parameters/DirectoryProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixPermissions"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixUmask"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceLeaseId"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The directory was renamed.",
+                        "headers": {
+                            "x-ms-continuation": {
+                                "x-ms-client-name": "marker",
+                                "type": "string",
+                                "description": "When renaming a directory, the number of paths that are renamed with each invocation is limited. If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header. When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "An HTTP entity tag associated with the file or directory."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The data and time the file or directory was last modified. Write operations on the file or directory update the last modified time."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the resource in bytes."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{filesystem}/{path}?DirectoryDelete": {
+            "delete": {
+                "tags": [
+                    "directory"
+                ],
+                "operationId": "Directory_Delete",
+                "description": "Deletes the directory",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/RecursiveDirectoryDelete"
+                    },
+                    {
+                        "$ref": "#/parameters/Continuation"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The directory was deleted.",
+                        "headers": {
+                            "x-ms-continuation": {
+                                "x-ms-client-name": "marker",
+                                "type": "string",
+                                "description": "When renaming a directory, the number of paths that are renamed with each invocation is limited. If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header. When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{containerName}/{blob}": {
+            "get": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Download",
+                "description": "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/GetRangeContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/GetRangeContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Returns the content of the entire blob.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The number of bytes present in the response body."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                            },
+                            "Content-Range": {
+                                "type": "string",
+                                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "Content-Encoding": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Encoding request header"
+                            },
+                            "Cache-Control": {
+                                "type": "string",
+                                "description": "This header is returned if it was previously specified for the blob."
+                            },
+                            "Content-Disposition": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                            },
+                            "Content-Language": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Language request header."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-blob-type": {
+                                "x-ms-client-name": "BlobType",
+                                "description": "The blob's type.",
+                                "type": "string",
+                                "enum": [
+                                    "BlockBlob",
+                                    "PageBlob",
+                                    "AppendBlob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "BlobType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-copy-completion-time": {
+                                "x-ms-client-name": "CopyCompletionTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status-description": {
+                                "x-ms-client-name": "CopyStatusDescription",
+                                "type": "string",
+                                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-progress": {
+                                "x-ms-client-name": "CopyProgress",
+                                "type": "string",
+                                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-source": {
+                                "x-ms-client-name": "CopySource",
+                                "type": "string",
+                                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Accept-Ranges": {
+                                "type": "string",
+                                "description": "Indicates that the service supports requests for partial blob content."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            },
+                            "x-ms-blob-content-md5": {
+                                "x-ms-client-name": "BlobContentMD5",
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                            },
+                            "x-ms-tag-count": {
+                                "x-ms-client-name": "TagCount",
+                                "type": "integer",
+                                "description": "The number of tags corresponding to the blob."
+                            }
+                        },
+                        "schema": {
+                            "type": "object",
+                            "format": "file"
+                        }
+                    },
+                    "206": {
+                        "description": "Returns the content of a specified range of the blob.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The number of bytes present in the response body."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
+                            },
+                            "Content-Range": {
+                                "type": "string",
+                                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "Content-Encoding": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Encoding request header"
+                            },
+                            "Cache-Control": {
+                                "type": "string",
+                                "description": "This header is returned if it was previously specified for the blob."
+                            },
+                            "Content-Disposition": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                            },
+                            "Content-Language": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Language request header."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-blob-type": {
+                                "x-ms-client-name": "BlobType",
+                                "description": "The blob's type.",
+                                "type": "string",
+                                "enum": [
+                                    "BlockBlob",
+                                    "PageBlob",
+                                    "AppendBlob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "BlobType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-content-crc64": {
+                                "x-ms-client-name": "ContentCrc64",
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the request is to read a specified range and the x-ms-range-get-content-crc64 is set to true, then the request returns a crc64 for the range, as long as the range size is less than or equal to 4 MB. If both x-ms-range-get-content-crc64 & x-ms-range-get-content-md5 is specified in the same request, it will fail with 400(Bad Request)"
+                            },
+                            "x-ms-copy-completion-time": {
+                                "x-ms-client-name": "CopyCompletionTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status-description": {
+                                "x-ms-client-name": "CopyStatusDescription",
+                                "type": "string",
+                                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-progress": {
+                                "x-ms-client-name": "CopyProgress",
+                                "type": "string",
+                                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-source": {
+                                "x-ms-client-name": "CopySource",
+                                "type": "string",
+                                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Accept-Ranges": {
+                                "type": "string",
+                                "description": "Indicates that the service supports requests for partial blob content."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                            },
+                            "x-ms-blob-content-md5": {
+                                "x-ms-client-name": "BlobContentMD5",
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
+                            },
+                            "x-ms-tag-count": {
+                                "x-ms-client-name": "TagCount",
+                                "type": "integer",
+                                "description": "The number of tags corresponding to the blob."
+                            }
+                        },
+                        "schema": {
+                            "type": "object",
+                            "format": "file"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "head": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_GetProperties",
+                "description": "The Get Properties operation returns all user-defined metadata, standard HTTP properties, and system properties for the blob. It does not return the content of the blob.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Returns the properties of the blob.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-creation-time": {
+                                "x-ms-client-name": "CreationTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was created."
+                            },
+                            "x-ms-meta": {
+                                "type": "string",
+                                "x-ms-client-name": "Metadata",
+                                "x-ms-header-collection-prefix": "x-ms-meta-"
+                            },
+                            "x-ms-blob-type": {
+                                "x-ms-client-name": "BlobType",
+                                "description": "The blob's type.",
+                                "type": "string",
+                                "enum": [
+                                    "BlockBlob",
+                                    "PageBlob",
+                                    "AppendBlob"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "BlobType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-copy-completion-time": {
+                                "x-ms-client-name": "CopyCompletionTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status-description": {
+                                "x-ms-client-name": "CopyStatusDescription",
+                                "type": "string",
+                                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-progress": {
+                                "x-ms-client-name": "CopyProgress",
+                                "type": "string",
+                                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
+                            },
+                            "x-ms-copy-source": {
+                                "x-ms-client-name": "CopySource",
+                                "type": "string",
+                                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-incremental-copy": {
+                                "x-ms-client-name": "IsIncrementalCopy",
+                                "type": "boolean",
+                                "description": "Included if the blob is incremental copy blob."
+                            },
+                            "x-ms-copy-destination-snapshot": {
+                                "x-ms-client-name": "DestinationSnapshot",
+                                "type": "string",
+                                "description": "Included if the blob is incremental copy blob or incremental copy snapshot, if x-ms-copy-status is success. Snapshot time of the last successful incremental copy snapshot for this blob."
+                            },
+                            "x-ms-lease-duration": {
+                                "x-ms-client-name": "LeaseDuration",
+                                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
+                                "type": "string",
+                                "enum": [
+                                    "infinite",
+                                    "fixed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseDurationType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-state": {
+                                "x-ms-client-name": "LeaseState",
+                                "description": "Lease state of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "available",
+                                    "leased",
+                                    "expired",
+                                    "breaking",
+                                    "broken"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStateType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "x-ms-lease-status": {
+                                "x-ms-client-name": "LeaseStatus",
+                                "description": "The current lease status of the blob.",
+                                "type": "string",
+                                "enum": [
+                                    "locked",
+                                    "unlocked"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "LeaseStatusType",
+                                    "modelAsString": false
+                                }
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The number of bytes present in the response body."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The content type specified for the blob. The default content type is 'application/octet-stream'"
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "Content-Encoding": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Encoding request header"
+                            },
+                            "Content-Disposition": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
+                            },
+                            "Content-Language": {
+                                "type": "string",
+                                "description": "This header returns the value that was specified for the Content-Language request header."
+                            },
+                            "Cache-Control": {
+                                "type": "string",
+                                "description": "This header is returned if it was previously specified for the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+               	            "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "Accept-Ranges": {
+                                "type": "string",
+                                "description": "Indicates that the service supports requests for partial blob content."
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the metadata. This header is only returned when the metadata was encrypted with customer specified encryption."
+                            },
+                            "x-ms-access-tier": {
+                                "x-ms-client-name": "AccessTier",
+                                "type": "string",
+                                "description": "The tier of page blob on a premium storage account or tier of block blob on blob storage LRS accounts. For a list of allowed premium page blob tiers, see https://docs.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features. For blob storage LRS accounts, valid values are Hot/Cool/Archive."
+                            },
+                            "x-ms-access-tier-inferred": {
+                                "x-ms-client-name": "AccessTierInferred",
+                                "type": "boolean",
+                                "description": "For page blobs on a premium storage account only. If the access tier is not explicitly set on the blob, the tier is inferred based on its content length and this header will be returned with true value."
+                            },
+                            "x-ms-archive-status": {
+                                "x-ms-client-name": "ArchiveStatus",
+                                "type": "string",
+                                "description": "For blob storage LRS accounts, valid values are rehydrate-pending-to-hot/rehydrate-pending-to-cool. If the blob is being rehydrated and is not complete then this header is returned indicating that rehydrate is pending and also tells the destination tier."
+                            },
+                            "x-ms-access-tier-change-time": {
+                                "x-ms-client-name": "AccessTierChangeTime",
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The time the tier was changed on the object. This is only returned if the tier on the block blob was ever set."
+                            },
+                            "x-ms-tag-count": {
+                                "x-ms-client-name": "TagCount",
+                                "type": "integer",
+                                "description": "The number of tags corresponding to the blob."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Delete",
+                "description": "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound). If the storage account's automatic snapshot feature is enabled, then, when a blob is deleted, an automatic snapshot is created. The blob becomes inaccessible immediately. All other operations on the blob causes the service to return an HTTP status code of 404 (ResourceNotFound). You can access automatic snapshot using snapshot timestamp or version id. You can restore the blob by calling Put or Copy Blob API with automatic snapshot as source. Deleting automatic snapshot requires shared key or special SAS/RBAC permissions.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/DeleteSnapshots"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The delete request was accepted and the blob will be deleted.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{filesystem}/{path}?FileRename": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Rename",
+                "description": "Rename a blob/file.  By default, the destination is overwritten and if the destination already exists and has a lease the lease is broken.  This operation supports conditional HTTP requests.  For more information, see [Specifying Conditional Headers for Blob Service Operations](https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations).  To fail if the destination already exists, use a conditional request with If-None-Match: \"*\".",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/PathRenameMode"
+                    },
+                    {
+                        "$ref": "#/parameters/FileRenameSource"
+                    },
+                    {
+                        "$ref": "#/parameters/DirectoryProperties"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixPermissions"
+                    },
+                    {
+                        "$ref": "#/parameters/PosixUmask"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/XMsContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceLeaseId"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The file was renamed.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "An HTTP entity tag associated with the file or directory."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "The data and time the file or directory was last modified.  Write operations on the file or directory update the last modified time."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            },
+                            "Content-Length": {
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the resource in bytes."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "A UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "A server-generated UUID recorded in the analytics logs for troubleshooting and correlation."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "The version of the REST protocol used to process the request."
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/DataLakeStorageError"
+                        }
+                    }
+                }
+            }
+        },
+        "/{containerName}/{blob}?PageBlob": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "PageBlob_Create",
+                "description": "The Create operation creates a new page blob.",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLengthRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobSequenceNumber"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The blob was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-blob-type",
+                    "x-ms-client-name": "blobType",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+                    "type": "string",
+                    "enum": [
+                        "PageBlob"
+                    ],
+                    "x-ms-enum": {
+                        "name": "BlobType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?AppendBlob": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "AppendBlob_Create",
+                "description": "The Create Append Blob operation creates a new append blob.",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The blob was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-blob-type",
+                    "x-ms-client-name": "blobType",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+                    "type": "string",
+                    "enum": [
+                        "AppendBlob"
+                    ],
+                    "x-ms-enum": {
+                        "name": "BlobType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?BlockBlob": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "BlockBlob_Upload",
+                "description": "The Upload Block Blob operation updates the content of an existing block blob. Updating an existing block blob overwrites any existing metadata on the blob. Partial updates are not supported with Put Blob; the content of the existing blob is overwritten with the content of the new blob. To perform a partial update of the content of a block blob, use the Put Block List operation.",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The blob was updated.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-blob-type",
+                    "x-ms-client-name": "blobType",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
+                    "type": "string",
+                    "enum": [
+                        "BlockBlob"
+                    ],
+                    "x-ms-enum": {
+                        "name": "BlobType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=undelete": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_Undelete",
+                "description": "Undelete a blob that was previously soft deleted",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The blob was undeleted successfully.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "undelete"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=properties&SetHTTPHeaders": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_SetHTTPHeaders",
+                "description": "The Set HTTP Headers operation sets system properties on the blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The properties were set successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=metadata": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_SetMetadata",
+                "description": "The Set Blob Metadata operation sets user-defined metadata for the specified blob as one or more name-value pairs",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The metadata was set successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the metadata. This header is only returned when the when the metadata was with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "metadata"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&acquire": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_AcquireLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseDuration"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The Acquire operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a blobs's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "acquire"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&release": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_ReleaseLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Release operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "release"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&renew": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_RenewLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Renew operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a blobs's lease"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "renew"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&change": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_ChangeLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/ProposedLeaseIdRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Change operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-lease-id": {
+                                "x-ms-client-name": "LeaseId",
+                                "type": "string",
+                                "description": "Uniquely identifies a blobs's lease"
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "change"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=lease&break": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_BreakLease",
+                "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseBreakPeriod"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The Break operation completed successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-lease-time": {
+                                "x-ms-client-name": "LeaseTime",
+                                "type": "integer",
+                                "description": "Approximate time remaining in the lease period, in seconds."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "lease"
+                    ]
+                },
+                {
+                    "name": "x-ms-lease-action",
+                    "x-ms-client-name": "action",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "break"
+                    ],
+                    "x-ms-enum": {
+                        "name": "LeaseAction",
+                        "modelAsString": false
+                    },
+                    "x-ms-parameter-location": "method",
+                    "description": "Describes what lease action to take."
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=snapshot": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_CreateSnapshot",
+                "description": "The Create Snapshot operation creates a read-only snapshot of a blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The snaptshot was taken successfully.",
+                        "headers": {
+                            "x-ms-snapshot": {
+                                "x-ms-client-name": "Snapshot",
+                                "type": "string",
+                                "description": "Uniquely identifies the snapshot and indicates the snapshot version. It may be used in subsequent requests to access the snapshot"
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "True if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise. For a snapshot request, this header is set to true when metadata was provided in the request and encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the source blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the source blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "snapshot"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=copy": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_StartCopyFromURL",
+                "description": "The Start Copy From URL operation copies a blob or an internet resource to a new blob.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+          },
+          {
+            "$ref": "#/parameters/RehydratePriority"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/CopySource"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The copy blob has been accepted with the specified copy status.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": []
+        },
+        "/{containerName}/{blob}?comp=copy&sync": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_CopyFromURL",
+                "description": "The Copy From URL operation copies a blob or an internet resource to a new blob. It will not return a response until the copy is complete.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/CopySource"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The copy has completed.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "success"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SyncCopyStatusType",
+                                    "modelAsString": false
+                                }
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "x-ms-requires-sync",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "true"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=copy&copyid={CopyId}": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_AbortCopyFromURL",
+                "description": "The Abort Copy From URL operation aborts a pending Copy From URL operation, and leaves a destination blob with zero length and full metadata.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/CopyId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "The delete request was accepted and the blob will be deleted.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "copy"
+                    ]
+                },
+                {
+                    "name": "x-ms-copy-action",
+                    "x-ms-client-name": "copyActionAbortConstant",
+                    "in": "header",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "abort"
+                    ],
+                    "x-ms-parameter-location": "method"
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=tier": {
+            "put": {
+                "tags": [
+                    "blobs"
+                ],
+                "operationId": "Blob_SetTier",
+                "description": "The Set Tier operation sets the tier on a blob. The operation is allowed on a page blob in a premium storage account and on a block blob in a blob storage account (locally redundant storage only). A premium page blob's tier determines the allowed size, IOPS, and bandwidth of the blob. A block blob's tier determines Hot/Cool/Archive storage type. This operation does not update the blob's ETag.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierRequired"
+          },
+          {
+            "$ref": "#/parameters/RehydratePriority"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The new tier will take effect immediately.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and newer."
+                            }
+                        }
+                    },
+                    "202": {
+                        "description": "The transition to the new tier is pending.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and newer."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "tier"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?restype=account&comp=properties": {
+            "get": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_GetAccountInfo",
+                "description": "Returns the sku name and account kind ",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success (OK)",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-sku-name": {
+                                "x-ms-client-name": "SkuName",
+                                "type": "string",
+                                "enum": [
+                                    "Standard_LRS",
+                                    "Standard_GRS",
+                                    "Standard_RAGRS",
+                                    "Standard_ZRS",
+                                    "Premium_LRS"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "SkuName",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the sku name of the account"
+                            },
+                            "x-ms-account-kind": {
+                                "x-ms-client-name": "AccountKind",
+                                "type": "string",
+                                "enum": [
+                                    "Storage",
+                                    "BlobStorage",
+                                    "StorageV2"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "AccountKind",
+                                    "modelAsString": false
+                                },
+                                "description": "Identifies the account kind"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "restype",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "account"
+                    ]
+                },
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=tags": {
+            "put": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_SetTags",
+                "description": "The Set Blob Tags operation sets tags for the specified blob. This API is only supported in version 2018-11-09 and later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/BlobTagsBody"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "The tags were set.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "blob"
+                ],
+                "operationId": "Blob_GetTags",
+                "description": "The Get Blob Tags operation returns all tags for the specified blob, snapshot, or version.  This API is only supported in version 2018-11-09 and later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Returns the tags.",
+                        "headers": {
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/BlobTags"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "tags"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=block": {
+            "put": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_StageBlock",
+                "description": "The Stage Block operation creates a new block to be committed as part of a blob",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/BlockId"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the block. This header is only returned when the block was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=block&fromURL": {
+            "put": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_StageBlockFromURL",
+                "description": "The Stage Block operation creates a new block to be committed as part of a blob where the contents are read from a URL.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/BlockId"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceRange"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the block. This header is only returned when the block was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "block"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=blocklist": {
+            "put": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_CommitBlockList",
+                "description": "The Commit Block List operation writes a blob by specifying the list of block IDs that make up the blob. In order to be written as part of a blob, a block must have been successfully written to the server in a prior Put Block operation. You can call Put Block List to update a blob by uploading only those blocks that have changed, then committing the new and existing blocks together. You can do this by specifying whether to commit a block from the committed block list or from the uncommitted block list, or to commit the most recently uploaded version of the block, whichever list it may belong to.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobCacheControl"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentType"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentEncoding"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLanguage"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/Metadata"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentDisposition"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobTagsHeader"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/AccessTierOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "name": "blocks",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/BlockLookupList"
+                        }
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block list was recorded.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. This header refers to the content of the request, meaning, in this case, the list of blocks, and not the content of the blob itself."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. This header refers to the content of the request, meaning, in this case, the list of blocks, and not the content of the blob itself."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "x-ms-version-id": {
+                                "x-ms-client-name": "VersionId",
+                                "type": "string",
+                                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the blob. This header is only returned when the blob was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "tags": [
+                    "blockblob"
+                ],
+                "operationId": "BlockBlob_GetBlockList",
+                "description": "The Get Block List operation retrieves the list of blocks that have been uploaded as part of a block blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/BlockListType"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The page range was written.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Content-Type": {
+                                "type": "string",
+                                "description": "The media type of the body of the response. For Get Block List this is 'application/xml'"
+                            },
+                            "x-ms-blob-content-length": {
+                                "x-ms-client-name": "BlobContentLength",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the blob in bytes."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/BlockList"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "blocklist"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=page&update": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_UploadPages",
+                "description": "The Upload Pages operation writes a range of pages to a page blob",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThan"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The page range was written.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for the page blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the pages. This header is only returned when the pages were encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the pages. This header is only returned when the pages were encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "page"
+                    ]
+                },
+                {
+                    "name": "x-ms-page-write",
+                    "x-ms-client-name": "pageWrite",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+                    "type": "string",
+                    "enum": [
+                        "update"
+                    ],
+                    "x-ms-enum": {
+                        "name": "PageWriteType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=page&clear": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_ClearPages",
+                "description": "The Clear Pages operation clears a set of pages from a page blob",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThan"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The page range was cleared.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for the page blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "page"
+                    ]
+                },
+                {
+                    "name": "x-ms-page-write",
+                    "x-ms-client-name": "pageWrite",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+                    "type": "string",
+                    "enum": [
+                        "clear"
+                    ],
+                    "x-ms-enum": {
+                        "name": "PageWriteType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=page&update&fromUrl": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_UploadPagesFromURL",
+                "description": "The Upload Pages operation writes a range of pages to a page blob where the contents are read from a URL",
+                "consumes": [
+                    "application/octet-stream"
+                ],
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/SourceUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceRangeRequiredPutPageFromUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/RangeRequiredPutPageFromUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberLessThan"
+                    },
+                    {
+                        "$ref": "#/parameters/IfSequenceNumberEqualTo"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The page range was written.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for the page blob."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "page"
+                    ]
+                },
+                {
+                    "name": "x-ms-page-write",
+                    "x-ms-client-name": "pageWrite",
+                    "in": "header",
+                    "required": true,
+                    "x-ms-parameter-location": "method",
+                    "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
+                    "type": "string",
+                    "enum": [
+                        "update"
+                    ],
+                    "x-ms-enum": {
+                        "name": "PageWriteType",
+                        "modelAsString": false
+                    }
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=pagelist": {
+            "get": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_GetPageRanges",
+                "description": "The Get Page Ranges operation returns the list of valid page ranges for a page blob, version or snapshot of a page blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Information on the page blob was found.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "x-ms-blob-content-length": {
+                                "x-ms-client-name": "BlobContentLength",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the blob in bytes."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/PageList"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "pagelist"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=pagelist&diff": {
+            "get": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_GetPageRangesDiff",
+                "description": "[Update] The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot or version.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Snapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/VersionId"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/PrevSnapshot"
+                    },
+                    {
+                        "$ref": "#/parameters/Range"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Information on the page blob was found.",
+                        "headers": {
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "x-ms-blob-content-length": {
+                                "x-ms-client-name": "BlobContentLength",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The size of the blob in bytes."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/PageList"
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "pagelist"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=properties&Resize": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_Resize",
+                "description": "Resize the Blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobContentLengthRequired"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The Blob was resized successfully",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=properties&UpdateSequenceNumber": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_UpdateSequenceNumber",
+                "description": "Update the sequence number of the blob",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SequenceNumberAction"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobSequenceNumber"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "The sequence numbers were updated successfully.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-blob-sequence-number": {
+                                "x-ms-client-name": "BlobSequenceNumber",
+                                "type": "integer",
+                                "format": "int64",
+                                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "properties"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=incrementalcopy": {
+            "put": {
+                "tags": [
+                    "pageblob"
+                ],
+                "operationId": "PageBlob_CopyIncremental",
+                "description": "The Copy Incremental operation copies a snapshot of the source page blob to a destination page blob. The snapshot is copied such that only the differential changes between the previously copied snapshot are transferred to the destination. The copied snapshots are complete copies of the original snapshot and can be read or copied from as usual. This API is supported since REST version 2016-05-31.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/CopySource"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "The blob was copied.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-copy-id": {
+                                "x-ms-client-name": "CopyId",
+                                "type": "string",
+                                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
+                            },
+                            "x-ms-copy-status": {
+                                "x-ms-client-name": "CopyStatus",
+                                "description": "State of the copy operation identified by x-ms-copy-id.",
+                                "type": "string",
+                                "enum": [
+                                    "pending",
+                                    "success",
+                                    "aborted",
+                                    "failed"
+                                ],
+                                "x-ms-enum": {
+                                    "name": "CopyStatusType",
+                                    "modelAsString": false
+                                }
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "incrementalcopy"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=appendblock": {
+            "put": {
+                "tags": [
+                    "appendblob"
+                ],
+                "operationId": "AppendBlob_AppendBlock",
+                "description": "The Append Block operation commits a new block of data to the end of an existing append blob. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/Body"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentCrc64"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionMaxSize"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionAppendPos"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKey"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionKeySha256"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionAlgorithm"
+                    },
+                    {
+                        "$ref": "#/parameters/EncryptionScope"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-client-request-id": {
+                                "x-ms-client-name": "ClientRequestId",
+                                "type": "string",
+                                "description": "If a client request id header is sent in the request, this header will be present in the response with the same value."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-append-offset": {
+                                "x-ms-client-name": "BlobAppendOffset",
+                                "type": "string",
+                                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            },
+                            "x-ms-request-server-encrypted": {
+                                "x-ms-client-name": "IsServerEncrypted",
+                                "type": "boolean",
+                                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+                            },
+                            "x-ms-encryption-key-sha256": {
+                                "x-ms-client-name": "EncryptionKeySha256",
+                                "type": "string",
+                                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
+                            },
+                            "x-ms-encryption-scope": {
+                                "x-ms-client-name": "EncryptionScope",
+                                "type": "string",
+                                "description": "The encryption scope used to encrypt the block. This header is only returned when the block was encrypted with customer specified encryption."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "appendblock"
+                    ]
+                }
+            ]
+        },
+        "/{containerName}/{blob}?comp=appendblock&fromUrl": {
+            "put": {
+                "tags": [
+                    "appendblob"
+                ],
+                "operationId": "AppendBlob_AppendBlockFromUrl",
+                "description": "The Append Block operation commits a new block of data to the end of an existing append blob where the contents are read from a source url. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
+                "parameters": [
+                    {
+                        "$ref": "#/parameters/SourceUrl"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceRange"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceContentCRC64"
+                    },
+                    {
+                        "$ref": "#/parameters/Timeout"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentLength"
+                    },
+                    {
+                        "$ref": "#/parameters/ContentMD5"
+                    },
+                    {
+                        "$ref": "#/parameters/LeaseIdOptional"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionMaxSize"
+                    },
+                    {
+                        "$ref": "#/parameters/BlobConditionAppendPos"
+                    },
+                    {
+                        "$ref": "#/parameters/IfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/IfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/IfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfModifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfUnmodifiedSince"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/SourceIfNoneMatch"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersionParameter"
+                    },
+                    {
+                        "$ref": "#/parameters/ClientRequestId"
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "The block was created.",
+                        "headers": {
+                            "ETag": {
+                                "type": "string",
+                                "format": "etag",
+                                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
+                            },
+                            "Last-Modified": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
+                            },
+                            "Content-MD5": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
+                            },
+                            "x-ms-content-crc64": {
+                                "type": "string",
+                                "format": "byte",
+                                "description": "This header is returned so that the client can check for message content integrity. The value of this header is computed by the Blob service; it is not necessarily the same value specified in the request headers."
+                            },
+                            "x-ms-request-id": {
+                                "x-ms-client-name": "RequestId",
+                                "type": "string",
+                                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                            },
+                            "x-ms-version": {
+                                "x-ms-client-name": "Version",
+                                "type": "string",
+                                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                            },
+                            "Date": {
+                                "type": "string",
+                                "format": "date-time-rfc1123",
+                                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                            },
+                            "x-ms-blob-append-offset": {
+                                "x-ms-client-name": "BlobAppendOffset",
+                                "type": "string",
+                                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
+                            },
+                            "x-ms-blob-committed-block-count": {
+                                "x-ms-client-name": "BlobCommittedBlockCount",
+                                "type": "integer",
+                                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "Failure",
+                        "headers": {
+                            "x-ms-error-code": {
+                                "x-ms-client-name": "ErrorCode",
+                                "type": "string"
+                            }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
+                        }
+                    }
+                }
+            },
+            "parameters": [
+                {
+                    "name": "comp",
+                    "in": "query",
+                    "required": true,
+                    "type": "string",
+                    "enum": [
+                        "appendblock"
+                    ]
+                }
+            ]
+        }
+    },
+  "definitions": {
+    "KeyInfo": {
+      "type": "object",
+      "required": [
+        "Start",
+        "Expiry"
+      ],
+      "description": "Key information",
+      "properties": {
+        "Start": {
+          "description": "The date-time the key is active in ISO 8601 UTC time",
+          "type": "string"
+        },
+        "Expiry": {
+          "description": "The date-time the key expires in ISO 8601 UTC time",
+          "type": "string"
+        }
+      }
+    },
+    "UserDelegationKey": {
+      "type": "object",
+      "required": [
+        "SignedOid",
+        "SignedTid",
+        "SignedStart",
+        "SignedExpiry",
+        "SignedService",
+        "SignedVersion",
+        "Value"
+      ],
+      "description": "A user delegation key",
+      "properties": {
+        "SignedOid": {
+          "description": "The Azure Active Directory object ID in GUID format.",
+          "type": "string"
+        },
+        "SignedTid": {
+          "description": "The Azure Active Directory tenant ID in GUID format",
+          "type": "string"
+        },
+        "SignedStart": {
+          "description": "The date-time the key is active",
+          "type": "string",
+          "format": "date-time"
+        },
+        "SignedExpiry": {
+          "description": "The date-time the key expires",
+          "type": "string",
+          "format": "date-time"
+        },
+        "SignedService": {
+          "description": "Abbreviation of the Azure Storage service that accepts the key",
+          "type": "string"
+        },
+        "SignedVersion": {
+          "description": "The service version that created the key",
+          "type": "string"
+        },
+        "Value": {
+          "description": "The key as a base64 string",
+          "type": "string"
+        }
+      }
+    },
+    "PublicAccessType": {
+      "type": "string",
+      "enum": [
+        "container",
+        "blob"
+      ],
+      "x-ms-enum": {
+        "name": "PublicAccessType",
+        "modelAsString": true
+      }
+    },
+    "CopyStatus": {
+      "type": "string",
+      "enum": [
+        "pending",
+        "success",
+        "aborted",
+        "failed"
+      ],
+      "x-ms-enum": {
+        "name": "CopyStatusType",
+        "modelAsString": false
+      }
+    },
+    "LeaseDuration": {
+      "type": "string",
+      "enum": [
+        "infinite",
+        "fixed"
+      ],
+      "x-ms-enum": {
+        "name": "LeaseDurationType",
+        "modelAsString": false
+      }
+    },
+    "LeaseState": {
+      "type": "string",
+      "enum": [
+        "available",
+        "leased",
+        "expired",
+        "breaking",
+        "broken"
+      ],
+      "x-ms-enum": {
+        "name": "LeaseStateType",
+        "modelAsString": false
+      }
+    },
+    "LeaseStatus": {
+      "type": "string",
+      "enum": [
+        "locked",
+        "unlocked"
+      ],
+      "x-ms-enum": {
+        "name": "LeaseStatusType",
+        "modelAsString": false
+      }
+    },
+    "StorageError": {
+      "type": "object",
+      "properties": {
+        "Message": {
+          "type": "string"
+        }
+      }
+    },
+    "DataLakeStorageError": {
+      "type": "object",
+      "properties": {
+        "error": {
+          "description": "The service error response object.",
+          "properties": {
+            "code": {
+              "description": "The service error code.",
+              "type": "string"
+            },
+            "message": {
+              "description": "The service error message.",
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "AccessPolicy": {
+      "type": "object",
+      "required": [
+        "Start",
+        "Expiry",
+        "Permission"
+      ],
+      "description": "An Access policy",
+      "properties": {
+        "Start": {
+          "description": "the date-time the policy is active",
+          "type": "string",
+          "format": "date-time"
+        },
+        "Expiry": {
+          "description": "the date-time the policy expires",
+          "type": "string",
+          "format": "date-time"
+        },
+        "Permission": {
+          "description": "the permissions for the acl policy",
+          "type": "string"
+        }
+      }
+    },
+    "AccessTier": {
+      "type": "string",
+      "enum": [
+        "P4",
+        "P6",
+        "P10",
+        "P20",
+        "P30",
+        "P40",
+        "P50",
+        "Hot",
+        "Cool",
+        "Archive"
+      ],
+      "x-ms-enum": {
+        "name": "AccessTier",
+        "modelAsString": true
+      }
+    },
+    "ArchiveStatus": {
+      "type": "string",
+      "enum": [
+        "rehydrate-pending-to-hot",
+        "rehydrate-pending-to-cool"
+      ],
+      "x-ms-enum": {
+        "name": "ArchiveStatus",
+        "modelAsString": true
+      }
+    },
+    "BlobItem": {
+      "xml": {
+        "name": "Blob"
+      },
+      "description": "An Azure Storage blob",
+      "type": "object",
+      "required": [
+        "Name",
+        "Deleted",
+        "Snapshot",
+        "VersionId",
+        "Properties"
+      ],
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Deleted": {
+          "type": "boolean"
+        },
+        "Snapshot": {
+          "type": "string"
+        },
+        "VersionId": {
+          "type": "string"
+        },
+        "Properties": {
+          "$ref": "#/definitions/BlobProperties"
+        },
+        "Metadata": {
+          "$ref": "#/definitions/BlobMetadata"
+        },
+        "Tags": {
+          "$ref": "#/definitions/BlobTags"
+        }
+      }
+    },
+    "BlobProperties": {
+      "xml": {
+        "name": "Properties"
+      },
+      "description": "Properties of a blob",
+      "type": "object",
+      "required": [
+        "Etag",
+        "Last-Modified",
+        "TagCount"
+      ],
+      "properties": {
+        "Creation-Time": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "Last-Modified": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "Etag": {
+          "type": "string",
+          "format": "etag"
+        },
+        "Content-Length": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Size in bytes"
+        },
+        "Content-Type": {
+          "type": "string"
+        },
+        "Content-Encoding": {
+          "type": "string"
+        },
+        "Content-Language": {
+          "type": "string"
+        },
+        "Content-MD5": {
+          "type": "string",
+          "format": "byte"
+        },
+        "Content-Disposition": {
+          "type": "string"
+        },
+        "Cache-Control": {
+          "type": "string"
+        },
+        "x-ms-blob-sequence-number": {
+          "x-ms-client-name": "blobSequenceNumber",
+          "type": "integer",
+          "format": "int64"
+        },
+        "BlobType": {
+          "type": "string",
+          "enum": [
+            "BlockBlob",
+            "PageBlob",
+            "AppendBlob"
+          ],
+          "x-ms-enum": {
+            "name": "BlobType",
+            "modelAsString": false
+          }
+        },
+        "LeaseStatus": {
+          "$ref": "#/definitions/LeaseStatus"
+        },
+        "LeaseState": {
+          "$ref": "#/definitions/LeaseState"
+        },
+        "LeaseDuration": {
+          "$ref": "#/definitions/LeaseDuration"
+        },
+        "CopyId": {
+          "type": "string"
+        },
+        "CopyStatus": {
+          "$ref": "#/definitions/CopyStatus"
+        },
+        "CopySource": {
+          "type": "string"
+        },
+        "CopyProgress": {
+          "type": "string"
+        },
+        "CopyCompletionTime": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "CopyStatusDescription": {
+          "type": "string"
+        },
+        "ServerEncrypted": {
+          "type": "boolean"
+        },
+        "IncrementalCopy": {
+          "type": "boolean"
+        },
+        "DestinationSnapshot": {
+          "type": "string"
+        },
+        "DeletedTime": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "RemainingRetentionDays": {
+          "type": "integer"
+        },
+        "AccessTier": {
+          "$ref": "#/definitions/AccessTier"
+        },
+        "AccessTierInferred": {
+          "type": "boolean"
+        },
+        "ArchiveStatus": {
+          "$ref": "#/definitions/ArchiveStatus"
+        },
+        "CustomerProvidedKeySha256": {
+          "type": "string"
+        },
+        "EncryptionScope": {
+          "type": "string"
+        },
+        "AccessTierChangeTime": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "TagCount": {
+          "type": "integer",
+          "description": "The number of tags corresponding to the blob."
+        }
+      }
+    },
+    "ListBlobsFlatSegmentResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of blobs",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "ContainerName",
+        "Segment"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "ContainerName": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Prefix": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "Delimiter": {
+          "type": "string"
+        },
+        "Segment": {
+          "$ref": "#/definitions/BlobFlatListSegment"
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "ListBlobsHierarchySegmentResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of blobs",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "ContainerName",
+        "Segment"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "ContainerName": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Prefix": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "Delimiter": {
+          "type": "string"
+        },
+        "Segment": {
+          "$ref": "#/definitions/BlobHierarchyListSegment"
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "BlobFlatListSegment": {
+      "xml": {
+        "name": "Blobs"
+      },
+      "required": [
+        "BlobItems"
+      ],
+      "type": "object",
+      "properties": {
+        "BlobItems": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlobItem"
+          }
+        }
+      }
+    },
+    "BlobHierarchyListSegment": {
+      "xml": {
+        "name": "Blobs"
+      },
+      "type": "object",
+      "required": [
+        "BlobItems"
+      ],
+      "properties": {
+        "BlobPrefixes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlobPrefix"
+          }
+        },
+        "BlobItems": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlobItem"
+          }
+        }
+      }
+    },
+    "BlobPrefix": {
+      "type": "object",
+      "required": [
+        "Name"
+      ],
+      "properties": {
+        "Name": {
+          "type": "string"
+        }
+      }
+    },
+    "Tag": {
+      "type": "object",
+      "required": [
+        "Key",
+        "Value"
+      ],
+      "description": "Represents a single user-provided tag.",
+      "properties": {
+        "Key": {
+          "description": "The tag name.",
+          "type": "string"
+        },
+        "Value": {
+          "description": "The tag value.",
+          "type": "string"
+        }
+      }
+    },
+    "BlobTags": {
+      "xml": {
+        "name": "Tags"
+      },
+      "description": "XML containing key/value pairs representing the tags for the blob.",
+      "properties": {
+        "TagSet": {
+          "xml": {
+            "wrapped": true
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Tag"
+          }
+        }
+      }
+    },
+    "Block": {
+      "type": "object",
+      "required": [
+        "Name",
+        "Size"
+      ],
+      "description": "Represents a single block in a block blob.  It describes the block's ID and size.",
+      "properties": {
+        "Name": {
+          "description": "The base64 encoded block ID.",
+          "type": "string"
+        },
+        "Size": {
+          "description": "The block size in bytes.",
+          "type": "integer"
+        }
+      }
+    },
+    "BlockList": {
+      "type": "object",
+      "properties": {
+        "CommittedBlocks": {
+          "xml": {
+            "wrapped": true
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Block"
+          }
+        },
+        "UncommittedBlocks": {
+          "xml": {
+            "wrapped": true
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Block"
+          }
+        }
+      }
+    },
+    "BlockLookupList": {
+      "type": "object",
+      "properties": {
+        "Committed": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "xml": {
+              "name": "Committed"
+            }
+          }
+        },
+        "Uncommitted": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "xml": {
+              "name": "Uncommitted"
+            }
+          }
+        },
+        "Latest": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "xml": {
+              "name": "Latest"
+            }
+          }
+        }
+      },
+      "xml": {
+        "name": "BlockList"
+      }
+    },
+    "ContainerItem": {
+      "xml": {
+        "name": "Container"
+      },
+      "type": "object",
+      "required": [
+        "Name",
+        "Properties"
+      ],
+      "description": "An Azure Storage container",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Properties": {
+          "$ref": "#/definitions/ContainerProperties"
+        },
+        "Metadata": {
+          "$ref": "#/definitions/ContainerMetadata"
+        }
+      }
+    },
+    "ContainerProperties": {
+      "type": "object",
+      "required": [
+        "Last-Modified",
+        "Etag"
+      ],
+      "description": "Properties of a container",
+      "properties": {
+        "Last-Modified": {
+          "type": "string",
+          "format": "date-time-rfc1123"
+        },
+        "Etag": {
+          "type": "string",
+          "format": "etag"
+        },
+        "LeaseStatus": {
+          "$ref": "#/definitions/LeaseStatus"
+        },
+        "LeaseState": {
+          "$ref": "#/definitions/LeaseState"
+        },
+        "LeaseDuration": {
+          "$ref": "#/definitions/LeaseDuration"
+        },
+        "PublicAccess": {
+          "$ref": "#/definitions/PublicAccessType"
+        },
+        "HasImmutabilityPolicy": {
+          "type": "boolean"
+        },
+        "HasLegalHold": {
+          "type": "boolean"
+        }
+      }
+    },
+    "ListContainersSegmentResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of containers",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "ContainerItems"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Prefix": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "ContainerItems": {
+          "xml": {
+            "wrapped": true,
+            "name": "Containers"
+          },
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ContainerItem"
+          }
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "CorsRule": {
+      "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
+      "type": "object",
+      "required": [
+        "AllowedOrigins",
+        "AllowedMethods",
+        "AllowedHeaders",
+        "ExposedHeaders",
+        "MaxAgeInSeconds"
+      ],
+      "properties": {
+        "AllowedOrigins": {
+          "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
+          "type": "string"
+        },
+        "AllowedMethods": {
+          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
+          "type": "string"
+        },
+        "AllowedHeaders": {
+          "description": "the request headers that the origin domain may specify on the CORS request.",
+          "type": "string"
+        },
+        "ExposedHeaders": {
+          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
+          "type": "string"
+        },
+        "MaxAgeInSeconds": {
+          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "ErrorCode": {
+      "description": "Error codes returned by the service",
+      "type": "string",
+      "enum": [
+        "AccountAlreadyExists",
+        "AccountBeingCreated",
+        "AccountIsDisabled",
+        "AuthenticationFailed",
+        "ConditionHeadersNotSupported",
+        "ConditionNotMet",
+        "EmptyMetadataKey",
+        "InsufficientAccountPermissions",
+        "InternalError",
+        "InvalidAuthenticationInfo",
+        "InvalidHeaderValue",
+        "InvalidHttpVerb",
+        "InvalidInput",
+        "InvalidMd5",
+        "InvalidMetadata",
+        "InvalidQueryParameterValue",
+        "InvalidRange",
+        "InvalidResourceName",
+        "InvalidUri",
+        "InvalidXmlDocument",
+        "InvalidXmlNodeValue",
+        "Md5Mismatch",
+        "MetadataTooLarge",
+        "MissingContentLengthHeader",
+        "MissingRequiredQueryParameter",
+        "MissingRequiredHeader",
+        "MissingRequiredXmlNode",
+        "MultipleConditionHeadersNotSupported",
+        "OperationTimedOut",
+        "OutOfRangeInput",
+        "OutOfRangeQueryParameterValue",
+        "RequestBodyTooLarge",
+        "ResourceTypeMismatch",
+        "RequestUrlFailedToParse",
+        "ResourceAlreadyExists",
+        "ResourceNotFound",
+        "ServerBusy",
+        "UnsupportedHeader",
+        "UnsupportedXmlNode",
+        "UnsupportedQueryParameter",
+        "UnsupportedHttpVerb",
+        "AppendPositionConditionNotMet",
+        "BlobAlreadyExists",
+        "BlobNotFound",
+        "BlobOverwritten",
+        "BlobTierInadequateForContentLength",
+        "BlockCountExceedsLimit",
+        "BlockListTooLong",
+        "CannotChangeToLowerTier",
+        "CannotVerifyCopySource",
+        "ContainerAlreadyExists",
+        "ContainerBeingDeleted",
+        "ContainerDisabled",
+        "ContainerNotFound",
+        "ContentLengthLargerThanTierLimit",
+        "CopyAcrossAccountsNotSupported",
+        "CopyIdMismatch",
+        "FeatureVersionMismatch",
+        "IncrementalCopyBlobMismatch",
+        "IncrementalCopyOfEralierVersionSnapshotNotAllowed",
+        "IncrementalCopySourceMustBeSnapshot",
+        "InfiniteLeaseDurationRequired",
+        "InvalidBlobOrBlock",
+        "InvalidBlobTier",
+        "InvalidBlobType",
+        "InvalidBlockId",
+        "InvalidBlockList",
+        "InvalidOperation",
+        "InvalidPageRange",
+        "InvalidSourceBlobType",
+        "InvalidSourceBlobUrl",
+        "InvalidVersionForPageBlobOperation",
+        "LeaseAlreadyPresent",
+        "LeaseAlreadyBroken",
+        "LeaseIdMismatchWithBlobOperation",
+        "LeaseIdMismatchWithContainerOperation",
+        "LeaseIdMismatchWithLeaseOperation",
+        "LeaseIdMissing",
+        "LeaseIsBreakingAndCannotBeAcquired",
+        "LeaseIsBreakingAndCannotBeChanged",
+        "LeaseIsBrokenAndCannotBeRenewed",
+        "LeaseLost",
+        "LeaseNotPresentWithBlobOperation",
+        "LeaseNotPresentWithContainerOperation",
+        "LeaseNotPresentWithLeaseOperation",
+        "MaxBlobSizeConditionNotMet",
+        "NoPendingCopyOperation",
+        "OperationNotAllowedOnIncrementalCopyBlob",
+        "PendingCopyOperation",
+        "PreviousSnapshotCannotBeNewer",
+        "PreviousSnapshotNotFound",
+        "PreviousSnapshotOperationNotSupported",
+        "SequenceNumberConditionNotMet",
+        "SequenceNumberIncrementTooLarge",
+        "SnapshotCountExceeded",
+        "SnaphotOperationRateExceeded",
+        "SnapshotsPresent",
+        "SourceConditionNotMet",
+        "SystemInUse",
+        "TargetConditionNotMet",
+        "UnauthorizedBlobOverwrite",
+        "BlobBeingRehydrated",
+        "BlobArchived",
+        "BlobNotArchived"
+      ],
+      "x-ms-enum": {
+        "name": "StorageErrorCode",
+        "modelAsString": true
+      }
+    },
+    "FilterBlobsItem": {
+      "xml": {
+        "name": "Blob"
+      },
+      "type": "object",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "ContainerName": {
+          "type": "string"
+        },
+        "TagValue": {
+          "type": "string"
+        }
+      }
+    },
+    "FilterBlobsSegment": {
+      "xml": {
+        "name": "Blobs"
+      },
+      "type": "object",
+      "properties": {
+        "BlobItems": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/FilterBlobsItem"
+          }
+        }
+      }
+    },
+    "FilterBlobsResponse": {
+      "xml": {
+        "name": "EnumerationResults"
+      },
+      "description": "An enumeration of blobs which matched the filter.",
+      "type": "object",
+      "required": [
+        "ServiceEndpoint",
+        "Filter",
+        "Segment",
+        "NextMarker"
+      ],
+      "properties": {
+        "ServiceEndpoint": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        },
+        "Filter": {
+          "type": "string"
+        },
+        "Marker": {
+          "type": "string"
+        },
+        "MaxResults": {
+          "type": "integer"
+        },
+        "Segment": {
+          "$ref": "#/definitions/FilterBlobsSegment"
+        },
+        "NextMarker": {
+          "type": "string"
+        }
+      }
+    },
+    "GeoReplication": {
+      "description": "Geo-Replication information for the Secondary Storage Service",
+      "type": "object",
+      "required": [
+        "Status",
+        "LastSyncTime"
+      ],
+      "properties": {
+        "Status": {
+          "description": "The status of the secondary location",
+          "type": "string",
+          "enum": [
+            "live",
+            "bootstrap",
+            "unavailable"
+          ],
+          "x-ms-enum": {
+            "name": "GeoReplicationStatusType",
+            "modelAsString": true
+          }
+        },
+        "LastSyncTime": {
+          "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
+          "type": "string",
+          "format": "date-time-rfc1123"
+        }
+      }
+    },
+    "Logging": {
+      "description": "Azure Analytics Logging settings.",
+      "type": "object",
+      "required": [
+        "Version",
+        "Delete",
+        "Read",
+        "Write",
+        "RetentionPolicy"
+      ],
+      "properties": {
+        "Version": {
+          "description": "The version of Storage Analytics to configure.",
+          "type": "string"
+        },
+        "Delete": {
+          "description": "Indicates whether all delete requests should be logged.",
+          "type": "boolean"
+        },
+        "Read": {
+          "description": "Indicates whether all read requests should be logged.",
+          "type": "boolean"
+        },
+        "Write": {
+          "description": "Indicates whether all write requests should be logged.",
+          "type": "boolean"
+        },
+        "RetentionPolicy": {
+          "$ref": "#/definitions/RetentionPolicy"
+        }
+      }
+    },
+    "ContainerMetadata": {
+      "type": "object",
+      "xml": {
+        "name": "Metadata"
+      },
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "BlobMetadata": {
+      "type": "object",
+      "xml": {
+        "name": "Metadata"
+      },
+      "properties": {
+        "Encrypted": {
+          "type": "string",
+          "xml": {
+            "attribute": true
+          }
+        }
+      },
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "Metrics": {
+      "description": "a summary of request statistics grouped by API in hour or minute aggregates for blobs",
+      "required": [
+        "Enabled"
+      ],
+      "properties": {
+        "Version": {
+          "description": "The version of Storage Analytics to configure.",
+          "type": "string"
+        },
+        "Enabled": {
+          "description": "Indicates whether metrics are enabled for the Blob service.",
+          "type": "boolean"
+        },
+        "IncludeAPIs": {
+          "description": "Indicates whether metrics should generate summary statistics for called API operations.",
+          "type": "boolean"
+        },
+        "RetentionPolicy": {
+          "$ref": "#/definitions/RetentionPolicy"
+        }
+      }
+    },
+    "PageList": {
+      "description": "the list of pages",
+      "type": "object",
+      "properties": {
+        "PageRange": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PageRange"
+          }
+        },
+        "ClearRange": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ClearRange"
+          }
+        }
+      }
+    },
+    "PageRange": {
+      "type": "object",
+      "required": [
+        "Start",
+        "End"
+      ],
+      "properties": {
+        "Start": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "Start"
+          }
+        },
+        "End": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "End"
+          }
+        }
+      },
+      "xml": {
+        "name": "PageRange"
+      }
+    },
+    "ClearRange": {
+      "type": "object",
+      "required": [
+        "Start",
+        "End"
+      ],
+      "properties": {
+        "Start": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "Start"
+          }
+        },
+        "End": {
+          "type": "integer",
+          "format": "int64",
+          "xml": {
+            "name": "End"
+          }
+        }
+      },
+      "xml": {
+        "name": "ClearRange"
+      }
+    },
+    "RetentionPolicy": {
+      "description": "the retention policy which determines how long the associated data should persist",
+      "type": "object",
+      "required": [
+        "Enabled"
+      ],
+      "properties": {
+        "Enabled": {
+          "description": "Indicates whether a retention policy is enabled for the storage service",
+          "type": "boolean"
+        },
+        "Days": {
+          "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
+          "type": "integer",
+          "minimum": 1
+        }
+      }
+    },
+    "SignedIdentifier": {
+      "xml": {
+        "name": "SignedIdentifier"
+      },
+      "description": "signed identifier",
+      "type": "object",
+      "required": [
+        "Id",
+        "AccessPolicy"
+      ],
+      "properties": {
+        "Id": {
+          "type": "string",
+          "description": "a unique id"
+        },
+        "AccessPolicy": {
+          "$ref": "#/definitions/AccessPolicy"
+        }
+      }
+    },
+    "SignedIdentifiers": {
+      "description": "a collection of signed identifiers",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/SignedIdentifier"
+      },
+      "xml": {
+        "wrapped": true,
+        "name": "SignedIdentifiers"
+      }
+    },
+    "StaticWebsite": {
+      "description": "The properties that enable an account to host a static website",
+      "type": "object",
+      "required": [
+        "Enabled"
+      ],
+      "properties": {
+        "Enabled": {
+          "description": "Indicates whether this account is hosting a static website",
+          "type": "boolean"
+        },
+        "IndexDocument": {
+          "description": "The default name of the index page under each directory",
+          "type": "string"
+        },
+        "ErrorDocument404Path": {
+          "description": "The absolute path of the custom 404 page",
+          "type": "string"
+        }
+      }
+    },
+    "StorageServiceProperties": {
+      "description": "Storage Service Properties.",
+      "type": "object",
+      "properties": {
+        "Logging": {
+          "$ref": "#/definitions/Logging"
+        },
+        "HourMetrics": {
+          "$ref": "#/definitions/Metrics"
+        },
+        "MinuteMetrics": {
+          "$ref": "#/definitions/Metrics"
+        },
+        "Cors": {
+          "description": "The set of CORS rules.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CorsRule"
+          },
+          "xml": {
+            "wrapped": true
+          }
+        },
+        "DefaultServiceVersion": {
+          "description": "The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions",
+          "type": "string"
+        },
+        "DeleteRetentionPolicy": {
+          "$ref": "#/definitions/RetentionPolicy"
+        },
+        "StaticWebsite": {
+          "$ref": "#/definitions/StaticWebsite"
+        }
+      }
+    },
+    "StorageServiceStats": {
+      "description": "Stats for the storage service.",
+      "type": "object",
+      "properties": {
+        "GeoReplication": {
+          "$ref": "#/definitions/GeoReplication"
+        }
+      }
+    }
+  },
+    "parameters": {
+        "Url": {
+            "name": "url",
+            "description": "The URL of the service account, container, or blob that is the targe of the desired operation.",
+            "required": true,
+            "type": "string",
+            "in": "path",
+            "x-ms-skip-url-encoding": true
+        },
+        "ApiVersionParameter": {
+            "name": "x-ms-version",
+            "x-ms-client-name": "version",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "description": "Specifies the version of the operation to use for this request.",
+            "enum": [
+                "2019-02-02"
+            ]
+        },
+        "Blob": {
+            "name": "blob",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+)*(?:\\.[a-zA-Z0-9]+){0,1}$",
+            "minLength": 1,
+            "maxLength": 1024,
+            "x-ms-parameter-location": "method",
+            "description": "The blob name."
+        },
+        "Filesystem": {
+            "name": "filesystem",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The filesystem name."
+        },
+        "Path": {
+            "name": "path",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The namespace path to a file or directory."
+        },
+        "BlobCacheControl": {
+            "name": "x-ms-blob-cache-control",
+            "x-ms-client-name": "blobCacheControl",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's cache control. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobConditionAppendPos": {
+            "name": "x-ms-blob-condition-appendpos",
+            "x-ms-client-name": "appendPosition",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "append-position-access-conditions"
+            },
+            "description": "Optional conditional header, used only for the Append Block operation. A number indicating the byte offset to compare. Append Block will succeed only if the append position is equal to this number. If it is not, the request will fail with the AppendPositionConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+        },
+        "BlobConditionMaxSize": {
+            "name": "x-ms-blob-condition-maxsize",
+            "x-ms-client-name": "maxSize",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "append-position-access-conditions"
+            },
+            "description": "Optional conditional header. The max length in bytes permitted for the append blob. If the Append Block operation would cause the blob to exceed that limit or if the blob size is already greater than the value specified in this header, the request will fail with MaxBlobSizeConditionNotMet error (HTTP status code 412 - Precondition Failed)."
+        },
+        "BlobPublicAccess": {
+            "name": "x-ms-blob-public-access",
+            "x-ms-client-name": "access",
+            "in": "header",
+            "required": false,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies whether data in the container may be accessed publicly and the level of access",
+            "type": "string",
+            "enum": [
+                "container",
+                "blob"
+            ],
+            "x-ms-enum": {
+                "name": "PublicAccessType",
+                "modelAsString": true
+            }
+        },
+        "AccessTierRequired": {
+            "name": "x-ms-access-tier",
+            "x-ms-client-name": "tier",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "enum": [
+                "P4",
+                "P6",
+                "P10",
+                "P20",
+                "P30",
+                "P40",
+                "P50",
+                "Hot",
+                "Cool",
+                "Archive"
+            ],
+            "x-ms-enum": {
+                "name": "AccessTier",
+                "modelAsString": true
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Indicates the tier to be set on the blob."
+        },
+        "AccessTierOptional": {
+            "name": "x-ms-access-tier",
+            "x-ms-client-name": "tier",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "Hot",
+                "Cool",
+                "Archive"
+            ],
+            "x-ms-enum": {
+                "name": "AccessTier",
+                "modelAsString": true
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Indicates the tier to be set on the blob."
+        },
+        "RehydratePriority": {
+            "name": "x-ms-rehydrate-priority",
+            "x-ms-client-name": "rehydratePriority",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "High",
+                "Standard"
+            ],
+            "x-ms-enum": {
+                "name": "RehydratePriority",
+                "modelAsString": true
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Optional: Indicates the priority with which to rehydrate an archived blob."
+        },
+        "BlobContentDisposition": {
+            "name": "x-ms-blob-content-disposition",
+            "x-ms-client-name": "blobContentDisposition",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's Content-Disposition header."
+        },
+        "BlobContentEncoding": {
+            "name": "x-ms-blob-content-encoding",
+            "x-ms-client-name": "blobContentEncoding",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's content encoding. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobContentLanguage": {
+            "name": "x-ms-blob-content-language",
+            "x-ms-client-name": "blobContentLanguage",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Set the blob's content language. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobContentLengthOptional": {
+            "name": "x-ms-blob-content-length",
+            "x-ms-client-name": "blobContentLength",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+        },
+        "BlobContentLengthRequired": {
+            "name": "x-ms-blob-content-length",
+            "x-ms-client-name": "blobContentLength",
+            "in": "header",
+            "required": true,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
+        },
+        "BlobContentMD5": {
+            "name": "x-ms-blob-content-md5",
+            "x-ms-client-name": "blobContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded."
+        },
+        "BlobContentType": {
+            "name": "x-ms-blob-content-type",
+            "x-ms-client-name": "blobContentType",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "blob-HTTP-headers"
+            },
+            "description": "Optional. Sets the blob's content type. If specified, this property is stored with the blob and returned with a read request."
+        },
+        "BlobSequenceNumber": {
+            "name": "x-ms-blob-sequence-number",
+            "x-ms-client-name": "blobSequenceNumber",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "default": 0,
+            "x-ms-parameter-location": "method",
+            "description": "Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1."
+        },
+        "BlobTagsBody": {
+            "name": "Tags",
+            "in": "body",
+            "required": true,
+            "schema": {
+                "$ref": "#/definitions/BlobTags"
+            },
+            "x-ms-parameter-location": "method"
+        },
+        "BlobTagsHeader": {
+            "name": "x-ms-tags",
+            "x-ms-client-name": "tags",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. A URL encoded query param string which specifies the tags to be created with the Blob object. e.g. TagName1=TagValue1&TagName2=TagValue2. The x-ms-tags header may contain up to 2kb of tags."
+        },
+        "BlobTagFilter": {
+            "name": "filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "x-m-parameter-location": "method",
+            "description": "The filter parameter enables the caller to query blobs whose tags match a given expression. The given expression must evaluate to true for a blob to be returned in the results."
+        },
+        "BlockId": {
+            "name": "blockid",
+            "x-ms-client-name": "blockId",
+            "in": "query",
+            "type": "string",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "A valid Base64 string value that identifies the block. Prior to encoding, the string must be less than or equal to 64 bytes in size. For a given blob, the length of the value specified for the blockid parameter must be the same size for each block."
+        },
+        "BlockListType": {
+            "name": "blocklisttype",
+            "x-ms-client-name": "listType",
+            "in": "query",
+            "required": true,
+            "default": "committed",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies whether to return the list of committed blocks, the list of uncommitted blocks, or both lists together.",
+            "type": "string",
+            "enum": [
+                "committed",
+                "uncommitted",
+                "all"
+            ],
+            "x-ms-enum": {
+                "name": "BlockListType",
+                "modelAsString": false
+            }
+        },
+        "Body": {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+                "type": "object",
+                "format": "file"
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Initial data"
+        },
+        "Continuation": {
+            "name": "continuation",
+            "x-ms-client-name": "marker",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "When renaming a directory, the number of paths that are renamed with each invocation is limited.  If the number of paths to be renamed exceeds this limit, a continuation token is returned in this response header.  When a continuation token is returned in the response, it must be specified in a subsequent invocation of the rename operation to continue renaming the directory."
+        },
+        "ContainerAcl": {
+            "name": "containerAcl",
+            "in": "body",
+            "schema": {
+                "$ref": "#/definitions/SignedIdentifiers"
+            },
+            "x-ms-parameter-location": "method",
+            "description": "the acls for the container"
+        },
+        "CopyId": {
+            "name": "copyid",
+            "x-ms-client-name": "copyId",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The copy identifier provided in the x-ms-copy-id header of the original Copy Blob operation."
+        },
+        "ClientRequestId": {
+            "name": "x-ms-client-request-id",
+            "x-ms-client-name": "requestId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled."
+        },
+        "ContainerName": {
+            "name": "containerName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The container name."
+        },
+        "ContentCrc64": {
+            "name": "x-ms-content-crc64",
+            "x-ms-client-name": "transactionalContentCrc64",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the transactional crc64 for the body, to be validated by the service."
+        },
+        "ContentLength": {
+            "name": "Content-Length",
+            "in": "header",
+            "required": true,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "description": "The length of the request."
+        },
+        "ContentMD5": {
+            "name": "Content-MD5",
+            "x-ms-client-name": "transactionalContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the transactional md5 for the body, to be validated by the service."
+        },
+        "CopySource": {
+            "name": "x-ms-copy-source",
+            "x-ms-client-name": "copySource",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "format": "url",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature."
+        },
+        "DeleteSnapshots": {
+            "name": "x-ms-delete-snapshots",
+            "x-ms-client-name": "deleteSnapshots",
+            "description": "Required if the blob has associated snapshots. Specify one of the following two options: include: Delete the base blob and all of its snapshots. only: Delete only the blob's snapshots and not the blob itself",
+            "x-ms-parameter-location": "method",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "include",
+                "only"
+            ],
+            "x-ms-enum": {
+                "name": "DeleteSnapshotsOptionType",
+                "modelAsString": false
+            }
+        },
+        "Delimiter": {
+            "name": "delimiter",
+            "description": "When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.",
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "in": "query",
+            "required": true
+        },
+        "DirectoryProperties": {
+            "name": "x-ms-properties",
+            "description": "Optional.  User-defined properties to be stored with the file or directory, in the format of a comma-separated list of name and value pairs \"n1=v1, n2=v2, ...\", where each value is base64 encoded.",
+            "x-ms-client-name": "directoryProperties",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "EncryptionKey": {
+            "name": "x-ms-encryption-key",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "EncryptionScope": {
+            "name": "x-ms-encryption-scope",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "x-ms-client-name": "EncryptionScope",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "customer-provided-key-info"
+            },
+            "description": "Optional. Specifies the encryption scope to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "EncryptionKeySha256": {
+            "name": "x-ms-encryption-key-sha256",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "x-ms-parameter-location": "method",
+            "description": "The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided."
+        },
+        "EncryptionAlgorithm": {
+            "name": "x-ms-encryption-algorithm",
+            "type": "string",
+            "in": "query",
+            "required": false,
+            "enum": [
+                "AES256"
+            ],
+            "x-ms-enum": {
+                "name": "EncryptionAlgorithmType",
+                "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "The algorithm used to produce the encryption key hash. Currently, the only accepted value is \"AES256\". Must be provided if the x-ms-encryption-key header is provided."
+        },
+        "DefaultEncryptionScope": {
+            "name": "x-ms-default-encryption-scope",
+            "type": "string",
+            "in": "header",
+            "required": false,
+            "x-ms-client-name": "DefaultEncryptionScope",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies the default encryption scope on the container. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "DenyEncryptionScopeOverride": {
+            "name": "x-ms-deny-encryption-scope-override",
+            "type": "boolean",
+            "in": "header",
+            "required": false,
+            "x-ms-client-name": "DenyEncryptionScopeOverride",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies whether to deny encryption scope override provided in the request or not. If true, reject the request with encryption scope. If false, encryption is performed using encryption scope provided in the request. For more information, see Encryption at Rest for Azure Storage Services."
+        },
+        "FileRenameSource": {
+            "name": "x-ms-rename-source",
+            "x-ms-client-name": "renameSource",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The file or directory to be renamed. The value must have the following format: \"/{filesysystem}/{path}\".  If \"x-ms-properties\" is specified, the properties will overwrite the existing properties; otherwise, the existing properties will be preserved."
+        },
+        "GetRangeContentMD5": {
+            "name": "x-ms-range-get-content-md5",
+            "x-ms-client-name": "rangeGetContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "boolean",
+            "x-ms-parameter-location": "method",
+            "description": "When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size."
+        },
+        "GetRangeContentCRC64": {
+            "name": "x-ms-range-get-content-crc64",
+            "x-ms-client-name": "rangeGetContentCRC64",
+            "in": "header",
+            "required": false,
+            "type": "boolean",
+            "x-ms-parameter-location": "method",
+            "description": "When set to true and specified together with the Range, the service returns the CRC64 hash for the range, as long as the range is less than or equal to 4 MB in size."
+        },
+        "IfMatch": {
+            "name": "If-Match",
+            "x-ms-client-name": "ifMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs with a matching value."
+        },
+        "IfModifiedSince": {
+            "name": "If-Modified-Since",
+            "x-ms-client-name": "ifModifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+        },
+        "IfNoneMatch": {
+            "name": "If-None-Match",
+            "x-ms-client-name": "ifNoneMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs without a matching value."
+        },
+        "IfUnmodifiedSince": {
+            "name": "If-Unmodified-Since",
+            "x-ms-client-name": "ifUnmodifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+        },
+        "IfSequenceNumberEqualTo": {
+            "name": "x-ms-if-sequence-number-eq",
+            "x-ms-client-name": "ifSequenceNumberEqualTo",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "sequence-number-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has the specified sequence number."
+        },
+        "IfSequenceNumberLessThan": {
+            "name": "x-ms-if-sequence-number-lt",
+            "x-ms-client-name": "ifSequenceNumberLessThan",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "sequence-number-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has a sequence number less than the specified."
+        },
+        "IfSequenceNumberLessThanOrEqualTo": {
+            "name": "x-ms-if-sequence-number-le",
+            "x-ms-client-name": "ifSequenceNumberLessThanOrEqualTo",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "format": "int64",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "sequence-number-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has a sequence number less than or equal to the specified."
+        },
+        "KeyInfo": {
+            "name": "KeyInfo",
+            "in": "body",
+            "x-ms-parameter-location": "method",
+            "required": true,
+            "schema": {
+                "$ref": "#/definitions/KeyInfo"
+            }
+        },
+        "ListBlobsInclude": {
+            "name": "include",
+            "in": "query",
+            "required": false,
+            "type": "array",
+            "collectionFormat": "csv",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "copy",
+                    "deleted",
+                    "metadata",
+                    "snapshots",
+                    "tags",
+                    "uncommittedblobs"
+                ],
+                "x-ms-enum": {
+                    "name": "ListBlobsIncludeItem",
+                    "modelAsString": false
+                }
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Include this parameter to specify one or more datasets to include in the response."
+        },
+        "ListContainersInclude": {
+            "name": "include",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "metadata"
+            ],
+            "x-ms-enum": {
+                "name": "ListContainersIncludeType",
+                "modelAsString": false
+            },
+            "x-ms-parameter-location": "method",
+            "description": "Include this parameter to specify that the container's metadata be returned as part of the response body."
+        },
+        "LeaseBreakPeriod": {
+            "name": "x-ms-lease-break-period",
+            "x-ms-client-name": "breakPeriod",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "x-ms-parameter-location": "method",
+            "description": "For a break operation, proposed duration the lease should continue before it is broken, in seconds, between 0 and 60. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately."
+        },
+        "LeaseDuration": {
+            "name": "x-ms-lease-duration",
+            "x-ms-client-name": "duration",
+            "in": "header",
+            "required": false,
+            "type": "integer",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change."
+        },
+        "LeaseIdOptional": {
+            "name": "x-ms-lease-id",
+            "x-ms-client-name": "leaseId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "lease-access-conditions"
+            },
+            "description": "If specified, the operation only succeeds if the resource's lease is active and matches this ID."
+        },
+        "LeaseIdRequired": {
+            "name": "x-ms-lease-id",
+            "x-ms-client-name": "leaseId",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the current lease ID on the resource."
+        },
+        "Marker": {
+            "name": "marker",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
+            "x-ms-parameter-location": "method"
+        },
+        "MaxResults": {
+            "name": "maxresults",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "x-ms-parameter-location": "method",
+            "description": "Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
+        },
+        "Metadata": {
+            "name": "x-ms-meta",
+            "x-ms-client-name": "metadata",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.",
+            "x-ms-header-collection-prefix": "x-ms-meta-"
+        },
+        "PathRenameMode": {
+            "name": "mode",
+            "x-ms-client-name": "pathRenameMode",
+            "description": "Determines the behavior of the rename operation",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "enum": [
+                "legacy",
+                "posix"
+            ],
+            "x-ms-enum": {
+                "name": "PathRenameMode",
+                "modelAsString": false
+            }
+        },
+        "PosixPermissions": {
+            "name": "x-ms-permissions",
+            "description": "Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission.  The sticky bit is also supported.  Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.",
+            "x-ms-client-name": "posixPermissions",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "PosixUmask": {
+            "name": "x-ms-umask",
+            "x-ms-client-name": "posixUmask",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Only valid if Hierarchical Namespace is enabled for the account. This umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. Otherwise the corresponding permission will be determined by the permission. A 4-digit octal notation (e.g. 0022) is supported here. If no umask was specified, a default umask - 0027 will be used."
+        },
+        "Prefix": {
+            "name": "prefix",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Filters the results to return only containers whose name begins with the specified prefix.",
+            "x-ms-parameter-location": "method"
+        },
+        "PrevSnapshot": {
+            "name": "prevsnapshot",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Optional in version 2015-07-08 and newer. The prevsnapshot parameter is a DateTime value that specifies that the response will contain only pages that were changed between target blob and previous snapshot. Changed pages include both updated and cleared pages. The target blob may be a snapshot, as long as the snapshot specified by prevsnapshot is the older of the two. Note that incremental snapshots are currently supported only for blobs created on or after January 1, 2016."
+        },
+        "ProposedLeaseIdOptional": {
+            "name": "x-ms-proposed-lease-id",
+            "x-ms-client-name": "proposedLeaseId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+        },
+        "ProposedLeaseIdRequired": {
+            "name": "x-ms-proposed-lease-id",
+            "x-ms-client-name": "proposedLeaseId",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
+        },
+        "Range": {
+            "name": "x-ms-range",
+            "x-ms-client-name": "range",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Return only the bytes of the blob in the specified range."
+        },
+        "RecursiveDirectoryDelete": {
+            "name": "recursive",
+            "x-ms-client-name": "recursiveDirectoryDelete",
+            "in": "query",
+            "required": true,
+            "type": "boolean",
+            "x-ms-parameter-location": "method",
+            "description": "If \"true\", all paths beneath the directory will be deleted. If \"false\" and the directory is non-empty, an error occurs."
+        },
+        "SequenceNumberAction": {
+            "name": "x-ms-sequence-number-action",
+            "x-ms-client-name": "sequenceNumberAction",
+            "in": "header",
+            "required": true,
+            "x-ms-parameter-location": "method",
+            "description": "Required if the x-ms-blob-sequence-number header is set for the request. This property applies to page blobs only. This property indicates how the service should modify the blob's sequence number",
+            "type": "string",
+            "enum": [
+                "max",
+                "update",
+                "increment"
+            ],
+            "x-ms-enum": {
+                "name": "SequenceNumberActionType",
+                "modelAsString": false
+            }
+        },
+        "Snapshot": {
+            "name": "snapshot",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob\">Creating a Snapshot of a Blob.</a>"
+        },
+        "SourceContentMD5": {
+            "name": "x-ms-source-content-md5",
+            "x-ms-client-name": "sourceContentMD5",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the md5 calculated for the range of bytes that must be read from the copy source."
+        },
+        "SourceContentCRC64": {
+            "name": "x-ms-source-content-crc64",
+            "x-ms-client-name": "sourceContentcrc64",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "byte",
+            "x-ms-parameter-location": "method",
+            "description": "Specify the crc64 calculated for the range of bytes that must be read from the copy source."
+        },
+        "SourceRange": {
+            "name": "x-ms-source-range",
+            "x-ms-client-name": "sourceRange",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Bytes of source data in the specified range."
+        },
+        "RangeRequiredPutPageFromUrl": {
+            "name": "x-ms-range",
+            "x-ms-client-name": "range",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required."
+        },
+        "SourceRangeRequiredPutPageFromUrl": {
+            "name": "x-ms-source-range",
+            "x-ms-client-name": "sourceRange",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "Bytes of source data in the specified range. The length of this range should match the ContentLength header and x-ms-range/Range destination range header."
+        },
+        "SourceIfMatch": {
+            "name": "x-ms-source-if-match",
+            "x-ms-client-name": "sourceIfMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs with a matching value."
+        },
+        "SourceIfModifiedSince": {
+            "name": "x-ms-source-if-modified-since",
+            "x-ms-client-name": "sourceIfModifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
+        },
+        "SourceIfNoneMatch": {
+            "name": "x-ms-source-if-none-match",
+            "x-ms-client-name": "sourceIfNoneMatch",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "etag",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify an ETag value to operate only on blobs without a matching value."
+        },
+        "SourceIfUnmodifiedSince": {
+            "name": "x-ms-source-if-unmodified-since",
+            "x-ms-client-name": "sourceIfUnmodifiedSince",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "source-modified-access-conditions"
+            },
+            "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
+        },
+        "SourceLeaseId": {
+            "name": "x-ms-source-lease-id",
+            "x-ms-client-name": "sourceLeaseId",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match."
+        },
+        "SourceUrl": {
+            "name": "x-ms-copy-source",
+            "x-ms-client-name": "sourceUrl",
+            "in": "header",
+            "required": true,
+            "type": "string",
+            "format": "url",
+            "x-ms-parameter-location": "method",
+            "description": "Specify a URL to the copy source."
+        },
+        "StorageServiceProperties": {
+            "name": "StorageServiceProperties",
+            "in": "body",
+            "required": true,
+            "schema": {
+                "$ref": "#/definitions/StorageServiceProperties"
+            },
+            "x-ms-parameter-location": "method",
+            "description": "The StorageService properties."
+        },
+        "Timeout": {
+            "name": "timeout",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 0,
+            "x-ms-parameter-location": "method",
+            "description": "The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations\">Setting Timeouts for Blob Service Operations.</a>"
+        },
+        "VersionId": {
+            "name": "versionid",
+            "x-ms-client-name": "versionId",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "description": "The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve."
+        },
+        "XMsCacheControl": {
+            "name": "x-ms-cache-control",
+            "x-ms-client-name": "cacheControl",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Cache control for given resource"
+        },
+        "XMsContentType": {
+            "name": "x-ms-content-type",
+            "x-ms-client-name": "contentType",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content type for given resource"
+        },
+        "XMsContentEncoding": {
+            "name": "x-ms-content-encoding",
+            "x-ms-client-name": "contentEncoding",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content encoding for given resource"
+        },
+        "XMsContentLanguage": {
+            "name": "x-ms-content-language",
+            "x-ms-client-name": "contentLanguage",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content language for given resource"
+        },
+        "XMsContentDisposition": {
+            "name": "x-ms-content-disposition",
+            "x-ms-client-name": "contentDisposition",
+            "in": "header",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+                "name": "directory-http-headers"
+            },
+            "description": "Content disposition for given resource"
+        }
+    }
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/swagger/blob.json b/sdk/storage/azure-storage-blob/swagger/blob.json
deleted file mode 100644
index 0bf6a308f327..000000000000
--- a/sdk/storage/azure-storage-blob/swagger/blob.json
+++ /dev/null
@@ -1,8647 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Azure Blob Storage",
-    "version": "2018-11-09",
-    "x-ms-code-generation-settings": {
-      "header": "MIT",
-      "strictSpecAdherence": false
-    }
-  },
-  "x-ms-parameterized-host": {
-    "hostTemplate": "{url}",
-    "useSchemePrefix": false,
-    "positionInOperation": "first",
-    "parameters": [
-      {
-        "$ref": "#/parameters/Url"
-      }
-    ]
-  },
-  "securityDefinitions": {
-    "blob_shared_key": {
-      "type": "apiKey",
-      "name": "Authorization",
-      "in": "header"
-    }
-  },
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/xml"
-  ],
-  "produces": [
-    "application/xml"
-  ],
-  "paths": {},
-  "x-ms-paths": {
-    "/?restype=service&comp=properties": {
-      "put": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_SetProperties",
-        "description": "Sets properties for a storage account's Blob service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
-        "parameters": [
-          {
-            "$ref": "#/parameters/StorageServiceProperties"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Success (Accepted)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetProperties",
-        "description": "gets the properties of a storage account's Blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceProperties"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/?restype=service&comp=stats": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetStatistics",
-        "description": "Retrieves statistics related to replication for the Blob service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceStats"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "stats"
-          ]
-        }
-      ]
-    },
-    "/?comp=list": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_ListContainersSegment",
-        "description": "The List Containers Segment operation returns a list of the containers under the specified account",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListContainersInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListContainersSegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/?restype=service&comp=userdelegationkey": {
-      "post": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetUserDelegationKey",
-        "description": "Retrieves a user delgation key for the Blob service. This is only a valid operation when using bearer token authentication.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/KeyInfo"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/UserDelegationKey"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "userdelegationkey"
-          ]
-        }
-      ]
-    },
-    "/?restype=account&comp=properties": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetAccountInfo",
-        "description": "Returns the sku name and account kind ",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success (OK)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-sku-name": {
-                "x-ms-client-name": "SkuName",
-                "type": "string",
-                "enum": [
-                  "Standard_LRS",
-                  "Standard_GRS",
-                  "Standard_RAGRS",
-                  "Standard_ZRS",
-                  "Premium_LRS"
-                ],
-                "x-ms-enum": {
-                  "name": "SkuName",
-                  "modelAsString": false
-                },
-                "description": "Identifies the sku name of the account"
-              },
-              "x-ms-account-kind": {
-                "x-ms-client-name": "AccountKind",
-                "type": "string",
-                "enum": [
-                  "Storage",
-                  "BlobStorage",
-                  "StorageV2"
-                ],
-                "x-ms-enum": {
-                  "name": "AccountKind",
-                  "modelAsString": false
-                },
-                "description": "Identifies the account kind"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "account"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_Create",
-        "description": "creates a new container under the specified account. If the container with the same name already exists, the operation fails",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/BlobPublicAccess"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Success, Container created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_GetProperties",
-        "description": "returns all user-defined metadata and system properties for the specified container. The data returned does not include the container's list of blobs",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-public-access": {
-                "x-ms-client-name": "BlobPublicAccess",
-                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
-                "type": "string",
-                "enum": [
-                  "container",
-                  "blob"
-                ],
-                "x-ms-enum": {
-                  "name": "PublicAccessType",
-                  "modelAsString": true
-                }
-              },
-              "x-ms-has-immutability-policy": {
-                "x-ms-client-name": "HasImmutabilityPolicy",
-                "description": "Indicates whether the container has an immutability policy set on it.",
-                "type": "boolean"
-              },
-              "x-ms-has-legal-hold": {
-                "x-ms-client-name": "HasLegalHold",
-                "description": "Indicates whether the container has a legal hold.",
-                "type": "boolean"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_Delete",
-        "description": "operation marks the specified container for deletion. The container and any blobs contained within it are later deleted during garbage collection",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Accepted",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=metadata": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_SetMetadata",
-        "description": "operation sets one or more user-defined name-value pairs for the specified container.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "metadata"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=acl": {
-      "get": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_GetAccessPolicy",
-        "description": "gets the permissions for the specified container. The permissions indicate whether container data may be accessed publicly.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "x-ms-blob-public-access": {
-                "x-ms-client-name": "BlobPublicAccess",
-                "description": "Indicated whether data in the container may be accessed publicly and the level of access",
-                "type": "string",
-                "enum": [
-                  "container",
-                  "blob"
-                ],
-                "x-ms-enum": {
-                  "name": "PublicAccessType",
-                  "modelAsString": true
-                }
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/SignedIdentifiers"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_SetAccessPolicy",
-        "description": "sets the permissions for the specified container. The permissions indicate whether blobs in a container may be accessed publicly.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/ContainerAcl"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobPublicAccess"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acl"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&acquire": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_AcquireLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseDuration"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The Acquire operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a container's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acquire"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&release": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_ReleaseLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Release operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "release"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&renew": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_RenewLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Renew operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a container's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "renew"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&break": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_BreakLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseBreakPeriod"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The Break operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-time": {
-                "x-ms-client-name": "LeaseTime",
-                "type": "integer",
-                "description": "Approximate time remaining in the lease period, in seconds."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "break"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?comp=lease&restype=container&change": {
-      "put": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_ChangeLease",
-        "description": "[Update] establishes and manages a lock on a container for delete operations. The lock duration can be 15 to 60 seconds, or can be infinite",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Change operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a container's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "change"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=list&flat": {
-      "get": {
-        "tags": [
-          "containers"
-        ],
-        "operationId": "Container_ListBlobFlatSegment",
-        "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListBlobsInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListBlobsFlatSegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=container&comp=list&hierarchy": {
-      "get": {
-        "tags": [
-          "containers"
-        ],
-        "operationId": "Container_ListBlobHierarchySegment",
-        "description": "[Update] The List Blobs operation returns a list of the blobs under the specified container",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Delimiter"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListBlobsInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For List Blobs this is 'application/xml'"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListBlobsHierarchySegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "container"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/{containerName}?restype=account&comp=properties": {
-      "get": {
-        "tags": [
-          "container"
-        ],
-        "operationId": "Container_GetAccountInfo",
-        "description": "Returns the sku name and account kind ",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success (OK)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-sku-name": {
-                "x-ms-client-name": "SkuName",
-                "type": "string",
-                "enum": [
-                  "Standard_LRS",
-                  "Standard_GRS",
-                  "Standard_RAGRS",
-                  "Standard_ZRS",
-                  "Premium_LRS"
-                ],
-                "x-ms-enum": {
-                  "name": "SkuName",
-                  "modelAsString": false
-                },
-                "description": "Identifies the sku name of the account"
-              },
-              "x-ms-account-kind": {
-                "x-ms-client-name": "AccountKind",
-                "type": "string",
-                "enum": [
-                  "Storage",
-                  "BlobStorage",
-                  "StorageV2"
-                ],
-                "x-ms-enum": {
-                  "name": "AccountKind",
-                  "modelAsString": false
-                },
-                "description": "Identifies the account kind"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "account"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}": {
-      "get": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_Download",
-        "description": "The Download operation reads or downloads a blob from the system, including its metadata and properties. You can also call Download to read a snapshot or verison.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/GetRangeContentMD5"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Returns the content of the entire blob.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "Content-Length": {
-                "type": "integer",
-                "format": "int64",
-                "description": "The number of bytes present in the response body."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
-              },
-              "Content-Range": {
-                "type": "string",
-                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "Content-Encoding": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Encoding request header"
-              },
-              "Cache-Control": {
-                "type": "string",
-                "description": "This header is returned if it was previously specified for the blob."
-              },
-              "Content-Disposition": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
-              },
-              "Content-Language": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Language request header."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-blob-type": {
-                "x-ms-client-name": "BlobType",
-                "description": "The blob's type.",
-                "type": "string",
-                "enum": [
-                  "BlockBlob",
-                  "PageBlob",
-                  "AppendBlob"
-                ],
-                "x-ms-enum": {
-                  "name": "BlobType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-copy-completion-time": {
-                "x-ms-client-name": "CopyCompletionTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status-description": {
-                "x-ms-client-name": "CopyStatusDescription",
-                "type": "string",
-                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-progress": {
-                "x-ms-client-name": "CopyProgress",
-                "type": "string",
-                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-source": {
-                "x-ms-client-name": "CopySource",
-                "type": "string",
-                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Accept-Ranges": {
-                "type": "string",
-                "description": "Indicates that the service supports requests for partial blob content."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              },
-              "x-ms-blob-content-md5": {
-                "x-ms-client-name": "BlobContentMD5",
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
-              }
-            },
-            "schema": {
-              "type": "object",
-              "format": "file"
-            }
-          },
-          "206": {
-            "description": "Returns the content of a specified range of the blob.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "Content-Length": {
-                "type": "integer",
-                "format": "int64",
-                "description": "The number of bytes present in the response body."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For Download Blob this is 'application/octet-stream'"
-              },
-              "Content-Range": {
-                "type": "string",
-                "description": "Indicates the range of bytes returned in the event that the client requested a subset of the blob by setting the 'Range' request header."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "Content-Encoding": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Encoding request header"
-              },
-              "Cache-Control": {
-                "type": "string",
-                "description": "This header is returned if it was previously specified for the blob."
-              },
-              "Content-Disposition": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
-              },
-              "Content-Language": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Language request header."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-blob-type": {
-                "x-ms-client-name": "BlobType",
-                "description": "The blob's type.",
-                "type": "string",
-                "enum": [
-                  "BlockBlob",
-                  "PageBlob",
-                  "AppendBlob"
-                ],
-                "x-ms-enum": {
-                  "name": "BlobType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-copy-completion-time": {
-                "x-ms-client-name": "CopyCompletionTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status-description": {
-                "x-ms-client-name": "CopyStatusDescription",
-                "type": "string",
-                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-progress": {
-                "x-ms-client-name": "CopyProgress",
-                "type": "string",
-                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-source": {
-                "x-ms-client-name": "CopySource",
-                "type": "string",
-                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Accept-Ranges": {
-                "type": "string",
-                "description": "Indicates that the service supports requests for partial blob content."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
-              },
-              "x-ms-blob-content-md5": {
-                "x-ms-client-name": "BlobContentMD5",
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has a MD5 hash, and if request contains range header (Range or x-ms-range), this response header is returned with the value of the whole blob's MD5 value. This value may or may not be equal to the value returned in Content-MD5 header, with the latter calculated from the requested range"
-              }
-            },
-            "schema": {
-              "type": "object",
-              "format": "file"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "head": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_GetProperties",
-        "description": "The Get Properties operation returns all user-defined metadata, standard HTTP properties, and system properties for the blob. It does not return the content of the blob.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Returns the properties of the blob.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-creation-time": {
-                "x-ms-client-name": "CreationTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was created."
-              },
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "x-ms-blob-type": {
-                "x-ms-client-name": "BlobType",
-                "description": "The blob's type.",
-                "type": "string",
-                "enum": [
-                  "BlockBlob",
-                  "PageBlob",
-                  "AppendBlob"
-                ],
-                "x-ms-enum": {
-                  "name": "BlobType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-copy-completion-time": {
-                "x-ms-client-name": "CopyCompletionTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Conclusion time of the last attempted Copy Blob operation where this blob was the destination blob. This value can specify the time of a completed, aborted, or failed copy attempt. This header does not appear if a copy is pending, if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status-description": {
-                "x-ms-client-name": "CopyStatusDescription",
-                "type": "string",
-                "description": "Only appears when x-ms-copy-status is failed or pending. Describes the cause of the last fatal or non-fatal copy operation failure. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-progress": {
-                "x-ms-client-name": "CopyProgress",
-                "type": "string",
-                "description": "Contains the number of bytes copied and the total bytes in the source in the last attempted Copy Blob operation where this blob was the destination blob. Can show between 0 and Content-Length bytes copied. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List"
-              },
-              "x-ms-copy-source": {
-                "x-ms-client-name": "CopySource",
-                "type": "string",
-                "description": "URL up to 2 KB in length that specifies the source blob or file used in the last attempted Copy Blob operation where this blob was the destination blob. This header does not appear if this blob has never been the destination in a Copy Blob operation, or if this blob has been modified after a concluded Copy Blob operation using Set Blob Properties, Put Blob, or Put Block List."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-incremental-copy": {
-                "x-ms-client-name": "IsIncrementalCopy",
-                "type": "boolean",
-                "description": "Included if the blob is incremental copy blob."
-              },
-              "x-ms-copy-destination-snapshot": {
-                "x-ms-client-name": "DestinationSnapshot",
-                "type": "string",
-                "description": "Included if the blob is incremental copy blob or incremental copy snapshot, if x-ms-copy-status is success. Snapshot time of the last successful incremental copy snapshot for this blob."
-              },
-              "x-ms-lease-duration": {
-                "x-ms-client-name": "LeaseDuration",
-                "description": "When a blob is leased, specifies whether the lease is of infinite or fixed duration.",
-                "type": "string",
-                "enum": [
-                  "infinite",
-                  "fixed"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseDurationType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-state": {
-                "x-ms-client-name": "LeaseState",
-                "description": "Lease state of the blob.",
-                "type": "string",
-                "enum": [
-                  "available",
-                  "leased",
-                  "expired",
-                  "breaking",
-                  "broken"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStateType",
-                  "modelAsString": false
-                }
-              },
-              "x-ms-lease-status": {
-                "x-ms-client-name": "LeaseStatus",
-                "description": "The current lease status of the blob.",
-                "type": "string",
-                "enum": [
-                  "locked",
-                  "unlocked"
-                ],
-                "x-ms-enum": {
-                  "name": "LeaseStatusType",
-                  "modelAsString": false
-                }
-              },
-              "Content-Length": {
-                "type": "integer",
-                "format": "int64",
-                "description": "The number of bytes present in the response body."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The content type specified for the blob. The default content type is 'application/octet-stream'"
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "Content-Encoding": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Encoding request header"
-              },
-              "Content-Disposition": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the 'x-ms-blob-content-disposition' header. The Content-Disposition response header field conveys additional information about how to process the response payload, and also can be used to attach additional metadata. For example, if set to attachment, it indicates that the user-agent should not display the response, but instead show a Save As dialog with a filename other than the blob name specified."
-              },
-              "Content-Language": {
-                "type": "string",
-                "description": "This header returns the value that was specified for the Content-Language request header."
-              },
-              "Cache-Control": {
-                "type": "string",
-                "description": "This header is returned if it was previously specified for the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "Accept-Ranges": {
-                "type": "string",
-                "description": "Indicates that the service supports requests for partial blob content."
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
-              },
-              "x-ms-access-tier": {
-                "x-ms-client-name": "AccessTier",
-                "type": "string",
-                "description": "The tier of page blob on a premium storage account or tier of block blob on blob storage LRS accounts. For a list of allowed premium page blob tiers, see https://docs.microsoft.com/en-us/azure/virtual-machines/windows/premium-storage#features. For blob storage LRS accounts, valid values are Hot/Cool/Archive."
-              },
-              "x-ms-access-tier-inferred": {
-                "x-ms-client-name": "AccessTierInferred",
-                "type": "boolean",
-                "description": "For page blobs on a premium storage account only. If the access tier is not explicitly set on the blob, the tier is inferred based on its content length and this header will be returned with true value."
-              },
-              "x-ms-archive-status": {
-                "x-ms-client-name": "ArchiveStatus",
-                "type": "string",
-                "description": "For blob storage LRS accounts, valid values are rehydrate-pending-to-hot/rehydrate-pending-to-cool. If the blob is being rehydrated and is not complete then this header is returned indicating that rehydrate is pending and also tells the destination tier."
-              },
-              "x-ms-access-tier-change-time": {
-                "x-ms-client-name": "AccessTierChangeTime",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "The time the tier was changed on the object. This is only returned if the tier on the block blob was ever set."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_Delete",
-        "description": "If the storage account's soft delete feature is disabled then, when a blob is deleted, it is permanently removed from the storage account. If the storage account's soft delete feature is enabled, then, when a blob is deleted, it is marked for deletion and becomes inaccessible immediately. However, the blob service retains the blob or snapshot for the number of days specified by the DeleteRetentionPolicy section of [Storage service properties] (Set-Blob-Service-Properties.md). After the specified number of days has passed, the blob's data is permanently removed from the storage account. Note that you continue to be charged for the soft-deleted blob's storage until it is permanently removed. Use the List Blobs API and specify the \"include=deleted\" query parameter to discover which blobs and snapshots have been soft deleted. You can then use the Undelete Blob API to restore a soft-deleted blob. All other operations on a soft-deleted blob or snapshot causes the service to return an HTTP status code of 404 (ResourceNotFound). If the storage account's automatic snapshot feature is enabled, then, when a blob is deleted, an automatic snapshot is created. The blob becomes inaccessible immediately. All other operations on the blob causes the service to return an HTTP status code of 404 (ResourceNotFound). You can access automatic snapshot using snapshot timestamp or version id. You can restore the blob by calling Put or Copy Blob API with automatic snapshot as source. Deleting automatic snapshot requires shared key or special SAS/RBAC permissions.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/DeleteSnapshots"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The delete request was accepted and the blob will be deleted.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      }
-    },
-    "/{containerName}/{blob}?PageBlob": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "PageBlob_Create",
-        "description": "The Create operation creates a new page blob.",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLengthRequired"
-          },
-          {
-            "$ref": "#/parameters/BlobSequenceNumber"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The blob was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-blob-type",
-          "x-ms-client-name": "blobType",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
-          "type": "string",
-          "enum": [
-            "PageBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?AppendBlob": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "AppendBlob_Create",
-        "description": "The Create Append Blob operation creates a new append blob.",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The blob was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-blob-type",
-          "x-ms-client-name": "blobType",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
-          "type": "string",
-          "enum": [
-            "AppendBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?BlockBlob": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "BlockBlob_Upload",
-        "description": "The Upload Block Blob operation updates the content of an existing block blob. Updating an existing block blob overwrites any existing metadata on the blob. Partial updates are not supported with Put Blob; the content of the existing blob is overwritten with the content of the new blob. To perform a partial update of the content of a block blob, use the Put Block List operation.",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The blob was updated.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-blob-type",
-          "x-ms-client-name": "blobType",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Specifies the type of blob to create: block blob, page blob, or append blob.",
-          "type": "string",
-          "enum": [
-            "BlockBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=undelete": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_Undelete",
-        "description": "Undelete a blob that was previously soft deleted",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The blob was undeleted successfully.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "undelete"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=properties&SetHTTPHeaders": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_SetHTTPHeaders",
-        "description": "The Set HTTP Headers operation sets system properties on the blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The properties were set successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=metadata": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_SetMetadata",
-        "description": "The Set Blob Metadata operation sets user-defined metadata for the specified blob as one or more name-value pairs",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The metadata was set successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the metadata. This header is only returned when the metadata was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "metadata"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&acquire": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_AcquireLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseDuration"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The Acquire operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a blobs's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acquire"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&release": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_ReleaseLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Release operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "release"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&renew": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_RenewLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Renew operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a blobs's lease"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "renew"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&change": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_ChangeLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/ProposedLeaseIdRequired"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Change operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-lease-id": {
-                "x-ms-client-name": "LeaseId",
-                "type": "string",
-                "description": "Uniquely identifies a blobs's lease"
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "change"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=lease&break": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_BreakLease",
-        "description": "[Update] The Lease Blob operation establishes and manages a lock on a blob for write and delete operations",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseBreakPeriod"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The Break operation completed successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the blob was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-lease-time": {
-                "x-ms-client-name": "LeaseTime",
-                "type": "integer",
-                "description": "Approximate time remaining in the lease period, in seconds."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "lease"
-          ]
-        },
-        {
-          "name": "x-ms-lease-action",
-          "x-ms-client-name": "action",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "break"
-          ],
-          "x-ms-enum": {
-            "name": "LeaseAction",
-            "modelAsString": false
-          },
-          "x-ms-parameter-location": "method",
-          "description": "Describes what lease action to take."
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=snapshot": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_CreateSnapshot",
-        "description": "The Create Snapshot operation creates a read-only snapshot of a blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The snaptshot was taken successfully.",
-            "headers": {
-              "x-ms-snapshot": {
-                "x-ms-client-name": "Snapshot",
-                "type": "string",
-                "description": "Uniquely identifies the snapshot and indicates the snapshot version. It may be used in subsequent requests to access the snapshot"
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "True if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise. For a snapshot request, this header is set to true when metadata was provided in the request and encrypted with a customer-provided key."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the source blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "snapshot"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=copy": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_StartCopyFromURL",
-        "description": "The Start Copy From URL operation copies a blob or an internet resource to a new blob.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/CopySource"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The copy blob has been accepted with the specified copy status.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{containerName}/{blob}?comp=copy&sync": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_CopyFromURL",
-        "description": "The Copy From URL operation copies a blob or an internet resource to a new blob. It will not return a response until the copy is complete.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/CopySource"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The copy has completed.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies the version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "success"
-                ],
-                "x-ms-enum": {
-                  "name": "SyncCopyStatusType",
-                  "modelAsString": false
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "x-ms-requires-sync",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "true"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=copy&copyid={CopyId}": {
-      "put": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_AbortCopyFromURL",
-        "description": "The Abort Copy From URL operation aborts a pending Copy From URL operation, and leaves a destination blob with zero length and full metadata.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/CopyId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "The delete request was accepted and the blob will be deleted.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "copy"
-          ]
-        },
-        {
-          "name": "x-ms-copy-action",
-          "x-ms-client-name": "copyActionAbortConstant",
-          "in": "header",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "abort"
-          ],
-          "x-ms-parameter-location": "method"
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=tier": {
-      "put": {
-        "tags": [
-          "blobs"
-        ],
-        "operationId": "Blob_SetTier",
-        "description": "The Set Tier operation sets the tier on a blob. The operation is allowed on a page blob in a premium storage account and on a block blob in a blob storage account (locally redundant storage only). A premium page blob's tier determines the allowed size, IOPS, and bandwidth of the blob. A block blob's tier determines Hot/Cool/Archive storage type. This operation does not update the blob's ETag.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/AccessTier"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The new tier will take effect immediately.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and newer."
-              }
-            }
-          },
-          "202": {
-            "description": "The transition to the new tier is pending.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and newer."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "tier"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?restype=account&comp=properties": {
-      "get": {
-        "tags": [
-          "blob"
-        ],
-        "operationId": "Blob_GetAccountInfo",
-        "description": "Returns the sku name and account kind ",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success (OK)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-sku-name": {
-                "x-ms-client-name": "SkuName",
-                "type": "string",
-                "enum": [
-                  "Standard_LRS",
-                  "Standard_GRS",
-                  "Standard_RAGRS",
-                  "Standard_ZRS",
-                  "Premium_LRS"
-                ],
-                "x-ms-enum": {
-                  "name": "SkuName",
-                  "modelAsString": false
-                },
-                "description": "Identifies the sku name of the account"
-              },
-              "x-ms-account-kind": {
-                "x-ms-client-name": "AccountKind",
-                "type": "string",
-                "enum": [
-                  "Storage",
-                  "BlobStorage",
-                  "StorageV2"
-                ],
-                "x-ms-enum": {
-                  "name": "AccountKind",
-                  "modelAsString": false
-                },
-                "description": "Identifies the account kind"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "account"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=block": {
-      "put": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_StageBlock",
-        "description": "The Stage Block operation creates a new block to be committed as part of a blob",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/BlockId"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/ContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "block"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=block&fromURL": {
-      "put": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_StageBlockFromURL",
-        "description": "The Stage Block operation creates a new block to be committed as part of a blob where the contents are read from a URL.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/BlockId"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/SourceUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceRange"
-          },
-          {
-            "$ref": "#/parameters/SourceContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-    	  },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "block"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=blocklist": {
-      "put": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_CommitBlockList",
-        "description": "The Commit Block List operation writes a blob by specifying the list of block IDs that make up the blob. In order to be written as part of a blob, a block must have been successfully written to the server in a prior Put Block operation. You can call Put Block List to update a blob by uploading only those blocks that have changed, then committing the new and existing blocks together. You can do this by specifying whether to commit a block from the committed block list or from the uncommitted block list, or to commit the most recently uploaded version of the block, whichever list it may belong to.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/BlobCacheControl"
-          },
-          {
-            "$ref": "#/parameters/BlobContentType"
-          },
-          {
-            "$ref": "#/parameters/BlobContentEncoding"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLanguage"
-          },
-          {
-            "$ref": "#/parameters/BlobContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobContentDisposition"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "name": "blocks",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/BlockLookupList"
-            }
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block list was recorded.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "x-ms-version-id": {
-                "x-ms-client-name": "VersionId",
-                "type": "string",
-                "description": "UTC date/time value generated by the service that identifies a version of the blob. This header is returned for requests made against version 2018-11-09 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "blockblob"
-        ],
-        "operationId": "BlockBlob_GetBlockList",
-        "description": "The Get Block List operation retrieves the list of blocks that have been uploaded as part of a block blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/BlockListType"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The page range was written.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Content-Type": {
-                "type": "string",
-                "description": "The media type of the body of the response. For Get Block List this is 'application/xml'"
-              },
-              "x-ms-blob-content-length": {
-                "x-ms-client-name": "BlobContentLength",
-                "type": "integer",
-                "format": "int64",
-                "description": "The size of the blob in bytes."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/BlockList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "blocklist"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=page&update": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_UploadPages",
-        "description": "The Upload Pages operation writes a range of pages to a page blob",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/ContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThan"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The page range was written.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for the page blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the pages. This header is only returned when the pages were encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "page"
-          ]
-        },
-        {
-          "name": "x-ms-page-write",
-          "x-ms-client-name": "pageWrite",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
-          "type": "string",
-          "enum": [
-            "update"
-          ],
-          "x-ms-enum": {
-            "name": "PageWriteType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=page&clear": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_ClearPages",
-        "description": "The Clear Pages operation clears a set of pages from a page blob",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThan"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The page range was cleared.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for the page blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "page"
-          ]
-        },
-        {
-          "name": "x-ms-page-write",
-          "x-ms-client-name": "pageWrite",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
-          "type": "string",
-          "enum": [
-            "clear"
-          ],
-          "x-ms-enum": {
-            "name": "PageWriteType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=page&update&fromUrl": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_UploadPagesFromURL",
-        "description": "The Upload Pages operation writes a range of pages to a page blob where the contents are read from a URL",
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/SourceUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceRangeRequiredPutPageFromUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceContentMD5"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/RangeRequiredPutPageFromUrl"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberLessThan"
-          },
-          {
-            "$ref": "#/parameters/IfSequenceNumberEqualTo"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The page range was written.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for the page blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "page"
-          ]
-        },
-        {
-          "name": "x-ms-page-write",
-          "x-ms-client-name": "pageWrite",
-          "in": "header",
-          "required": true,
-          "x-ms-parameter-location": "method",
-          "description": "Required. You may specify one of the following options:\n  - Update: Writes the bytes specified by the request body into the specified range. The Range and Content-Length headers must match to perform the update.\n  - Clear: Clears the specified range and releases the space used in storage for that range. To clear a range, set the Content-Length header to zero, and the Range header to a value that indicates the range to clear, up to maximum blob size.",
-          "type": "string",
-          "enum": [
-            "update"
-          ],
-          "x-ms-enum": {
-            "name": "PageWriteType",
-            "modelAsString": false
-          }
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=pagelist": {
-      "get": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_GetPageRanges",
-        "description": "The Get Page Ranges operation returns the list of valid page ranges for a page blob, version or snapshot of a page blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Information on the page blob was found.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "x-ms-blob-content-length": {
-                "x-ms-client-name": "BlobContentLength",
-                "type": "integer",
-                "format": "int64",
-                "description": "The size of the blob in bytes."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/PageList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "pagelist"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=pagelist&diff": {
-      "get": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_GetPageRangesDiff",
-        "description": "[Update] The Get Page Ranges Diff operation returns the list of valid page ranges for a page blob that were changed between target blob and previous snapshot or version.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Snapshot"
-          },
-          {
-            "$ref": "#/parameters/VersionId"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/PrevSnapshot"
-          },
-          {
-            "$ref": "#/parameters/Range"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Information on the page blob was found.",
-            "headers": {
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "x-ms-blob-content-length": {
-                "x-ms-client-name": "BlobContentLength",
-                "type": "integer",
-                "format": "int64",
-                "description": "The size of the blob in bytes."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/PageList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "pagelist"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=properties&Resize": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_Resize",
-        "description": "Resize the Blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/BlobContentLengthRequired"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The Blob was resized successfully",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=properties&UpdateSequenceNumber": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_UpdateSequenceNumber",
-        "description": "Update the sequence number of the blob",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/SequenceNumberAction"
-          },
-          {
-            "$ref": "#/parameters/BlobSequenceNumber"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The sequence numbers were updated successfully.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-blob-sequence-number": {
-                "x-ms-client-name": "BlobSequenceNumber",
-                "type": "integer",
-                "format": "int64",
-                "description": "The current sequence number for a page blob. This header is not returned for block blobs or append blobs"
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=incrementalcopy": {
-      "put": {
-        "tags": [
-          "pageblob"
-        ],
-        "operationId": "PageBlob_CopyIncremental",
-        "description": "The Copy Incremental operation copies a snapshot of the source page blob to a destination page blob. The snapshot is copied such that only the differential changes between the previously copied snapshot are transferred to the destination. The copied snapshots are complete copies of the original snapshot and can be read or copied from as usual. This API is supported since REST version 2016-05-31.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/CopySource"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "The blob was copied.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-copy-id": {
-                "x-ms-client-name": "CopyId",
-                "type": "string",
-                "description": "String identifier for this copy operation. Use with Get Blob Properties to check the status of this copy operation, or pass to Abort Copy Blob to abort a pending copy."
-              },
-              "x-ms-copy-status": {
-                "x-ms-client-name": "CopyStatus",
-                "description": "State of the copy operation identified by x-ms-copy-id.",
-                "type": "string",
-                "enum": [
-                  "pending",
-                  "success",
-                  "aborted",
-                  "failed"
-                ],
-                "x-ms-enum": {
-                  "name": "CopyStatusType",
-                  "modelAsString": false
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "incrementalcopy"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=appendblock": {
-      "put": {
-        "tags": [
-          "appendblob"
-        ],
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "operationId": "AppendBlob_AppendBlock",
-        "description": "The Append Block operation commits a new block of data to the end of an existing append blob. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/Body"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/ContentMD5"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionMaxSize"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionAppendPos"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKey"
-          },
-          {
-            "$ref": "#/parameters/EncryptionKeySha256"
-          },
-          {
-            "$ref": "#/parameters/EncryptionAlgorithm"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-append-offset": {
-                "x-ms-client-name": "BlobAppendOffset",
-                "type": "string",
-                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              },
-              "x-ms-request-server-encrypted": {
-                "x-ms-client-name": "IsServerEncrypted",
-                "type": "boolean",
-                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
-              },
-              "x-ms-encryption-key-sha256": {
-                "x-ms-client-name": "EncryptionKeySha256",
-                "type": "string",
-                "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "appendblock"
-          ]
-        }
-      ]
-    },
-    "/{containerName}/{blob}?comp=appendblock&fromUrl": {
-      "put": {
-        "tags": [
-          "appendblob"
-        ],
-        "operationId": "AppendBlob_AppendBlockFromUrl",
-        "description": "The Append Block operation commits a new block of data to the end of an existing append blob where the contents are read from a source url. The Append Block operation is permitted only if the blob was created with x-ms-blob-type set to AppendBlob. Append Block is supported only on version 2015-02-21 version or later.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ContainerName"
-          },
-          {
-            "$ref": "#/parameters/Blob"
-          },
-          {
-            "$ref": "#/parameters/SourceUrl"
-          },
-          {
-            "$ref": "#/parameters/SourceRange"
-          },
-          {
-            "$ref": "#/parameters/SourceContentMD5"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ContentLength"
-          },
-          {
-            "$ref": "#/parameters/LeaseIdOptional"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionMaxSize"
-          },
-          {
-            "$ref": "#/parameters/BlobConditionAppendPos"
-          },
-          {
-            "$ref": "#/parameters/IfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/IfMatch"
-          },
-          {
-            "$ref": "#/parameters/IfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfModifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfUnmodifiedSince"
-          },
-          {
-            "$ref": "#/parameters/SourceIfMatch"
-          },
-          {
-            "$ref": "#/parameters/SourceIfNoneMatch"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "The block was created.",
-            "headers": {
-              "ETag": {
-                "type": "string",
-                "format": "etag",
-                "description": "The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes."
-              },
-              "Last-Modified": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob."
-              },
-              "Content-MD5": {
-                "type": "string",
-                "format": "byte",
-                "description": "If the blob has an MD5 hash and this operation is to read the full blob, this response header is returned so that the client can check for message content integrity."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-blob-append-offset": {
-                "x-ms-client-name": "BlobAppendOffset",
-                "type": "string",
-                "description": "This response header is returned only for append operations. It returns the offset at which the block was committed, in bytes."
-              },
-              "x-ms-blob-committed-block-count": {
-                "x-ms-client-name": "BlobCommittedBlockCount",
-                "type": "integer",
-                "description": "The number of committed blocks present in the blob. This header is returned only for append blobs."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "appendblock"
-          ]
-        }
-      ]
-    }
-  },
-  "definitions": {
-    "KeyInfo": {
-      "type": "object",
-      "required": [
-        "Start",
-        "Expiry"
-      ],
-      "description": "Key information",
-      "properties": {
-        "Start": {
-          "description": "The date-time the key is active in ISO 8601 UTC time",
-          "type": "string"
-        },
-        "Expiry": {
-          "description": "The date-time the key expires in ISO 8601 UTC time",
-          "type": "string"
-        }
-      }
-    },
-    "UserDelegationKey": {
-      "type": "object",
-      "required": [
-        "SignedOid",
-        "SignedTid",
-        "SignedStart",
-        "SignedExpiry",
-        "SignedService",
-        "SignedVersion",
-        "Value"
-      ],
-      "description": "A user delegation key",
-      "properties": {
-        "SignedOid": {
-          "description": "The Azure Active Directory object ID in GUID format.",
-          "type": "string"
-        },
-        "SignedTid": {
-          "description": "The Azure Active Directory tenant ID in GUID format",
-          "type": "string"
-        },
-        "SignedStart": {
-          "description": "The date-time the key is active",
-          "type": "string",
-          "format": "date-time"
-        },
-        "SignedExpiry": {
-          "description": "The date-time the key expires",
-          "type": "string",
-          "format": "date-time"
-        },
-        "SignedService": {
-          "description": "Abbreviation of the Azure Storage service that accepts the key",
-          "type": "string"
-        },
-        "SignedVersion": {
-          "description": "The service version that created the key",
-          "type": "string"
-        },
-        "Value": {
-          "description": "The key as a base64 string",
-          "type": "string"
-        }
-      }
-    },
-    "PublicAccessType": {
-      "type": "string",
-      "enum": [
-        "container",
-        "blob"
-      ],
-      "x-ms-enum": {
-        "name": "PublicAccessType",
-        "modelAsString": true
-      }
-    },
-    "CopyStatus": {
-      "type": "string",
-      "enum": [
-        "pending",
-        "success",
-        "aborted",
-        "failed"
-      ],
-      "x-ms-enum": {
-        "name": "CopyStatusType",
-        "modelAsString": false
-      }
-    },
-    "LeaseDuration": {
-      "type": "string",
-      "enum": [
-        "infinite",
-        "fixed"
-      ],
-      "x-ms-enum": {
-        "name": "LeaseDurationType",
-        "modelAsString": false
-      }
-    },
-    "LeaseState": {
-      "type": "string",
-      "enum": [
-        "available",
-        "leased",
-        "expired",
-        "breaking",
-        "broken"
-      ],
-      "x-ms-enum": {
-        "name": "LeaseStateType",
-        "modelAsString": false
-      }
-    },
-    "LeaseStatus": {
-      "type": "string",
-      "enum": [
-        "locked",
-        "unlocked"
-      ],
-      "x-ms-enum": {
-        "name": "LeaseStatusType",
-        "modelAsString": false
-      }
-    },
-    "StorageError": {
-      "type": "object",
-      "properties": {
-        "Code": {
-          "type": "string"
-        },
-        "Message": {
-          "type": "string"
-        }
-      }
-    },
-    "AccessPolicy": {
-      "type": "object",
-      "required": [
-        "Start",
-        "Expiry",
-        "Permission"
-      ],
-      "description": "An Access policy",
-      "properties": {
-        "Start": {
-          "description": "the date-time the policy is active",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Expiry": {
-          "description": "the date-time the policy expires",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Permission": {
-          "description": "the permissions for the acl policy",
-          "type": "string"
-        }
-      }
-    },
-    "AccessTier": {
-      "type": "string",
-      "enum": [
-        "P4",
-        "P6",
-        "P10",
-        "P20",
-        "P30",
-        "P40",
-        "P50",
-        "Hot",
-        "Cool",
-        "Archive"
-      ],
-      "x-ms-enum": {
-        "name": "AccessTier",
-        "modelAsString": true
-      }
-    },
-    "ArchiveStatus": {
-      "type": "string",
-      "enum": [
-        "rehydrate-pending-to-hot",
-        "rehydrate-pending-to-cool"
-      ],
-      "x-ms-enum": {
-        "name": "ArchiveStatus",
-        "modelAsString": true
-      }
-    },
-    "BlobItem": {
-      "xml": {
-        "name": "Blob"
-      },
-      "description": "An Azure Storage blob",
-      "type": "object",
-      "required": [
-        "Name",
-        "Deleted",
-        "Snapshot",
-        "VersionId",
-        "Properties"
-      ],
-      "properties": {
-        "Name": {
-          "type": "string"
-        },
-        "Deleted": {
-          "type": "boolean"
-        },
-        "Snapshot": {
-          "type": "string"
-        },
-        "VersionId": {
-          "type": "string"
-        },
-        "Properties": {
-          "$ref": "#/definitions/BlobProperties"
-        },
-        "Metadata": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "IsPrefix": {
-          "type": "boolean"
-        }
-      }
-    },
-    "BlobProperties": {
-      "xml": {
-        "name": "Properties"
-      },
-      "description": "Properties of a blob",
-      "type": "object",
-      "required": [
-        "Etag",
-        "Last-Modified"
-      ],
-      "properties": {
-        "Creation-Time": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "Last-Modified": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "Etag": {
-          "type": "string",
-          "format": "etag"
-        },
-        "Content-Length": {
-          "type": "integer",
-          "format": "int64",
-          "description": "Size in bytes"
-        },
-        "Content-Type": {
-          "type": "string"
-        },
-        "Content-Encoding": {
-          "type": "string"
-        },
-        "Content-Language": {
-          "type": "string"
-        },
-        "Content-MD5": {
-          "type": "string",
-          "format": "byte"
-        },
-        "Content-Disposition": {
-          "type": "string"
-        },
-        "Cache-Control": {
-          "type": "string"
-        },
-        "x-ms-blob-sequence-number": {
-          "x-ms-client-name": "blobSequenceNumber",
-          "type": "integer",
-          "format": "int64"
-        },
-        "BlobType": {
-          "type": "string",
-          "enum": [
-            "BlockBlob",
-            "PageBlob",
-            "AppendBlob"
-          ],
-          "x-ms-enum": {
-            "name": "BlobType",
-            "modelAsString": false
-          }
-        },
-        "LeaseStatus": {
-          "$ref": "#/definitions/LeaseStatus"
-        },
-        "LeaseState": {
-          "$ref": "#/definitions/LeaseState"
-        },
-        "LeaseDuration": {
-          "$ref": "#/definitions/LeaseDuration"
-        },
-        "CopyId": {
-          "type": "string"
-        },
-        "CopyStatus": {
-          "$ref": "#/definitions/CopyStatus"
-        },
-        "CopySource": {
-          "type": "string"
-        },
-        "CopyProgress": {
-          "type": "string"
-        },
-        "CopyCompletionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "CopyStatusDescription": {
-          "type": "string"
-        },
-        "ServerEncrypted": {
-          "type": "boolean"
-        },
-        "IncrementalCopy": {
-          "type": "boolean"
-        },
-        "DestinationSnapshot": {
-          "type": "string"
-        },
-        "DeletedTime": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "RemainingRetentionDays": {
-          "type": "integer"
-        },
-        "AccessTier": {
-          "$ref": "#/definitions/AccessTier"
-        },
-        "AccessTierInferred": {
-          "type": "boolean"
-        },
-        "ArchiveStatus": {
-          "$ref": "#/definitions/ArchiveStatus"
-        },
-        "CustomerProvidedKeySha256": {
-          "type": "string"
-        },
-        "AccessTierChangeTime": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        }
-      }
-    },
-    "ListBlobsFlatSegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "An enumeration of blobs",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "ContainerName",
-        "Prefix",
-        "Marker",
-        "MaxResults",
-        "Delimiter",
-        "Segment",
-        "NextMarker"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "ContainerName": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "Delimiter": {
-          "type": "string"
-        },
-        "Segment": {
-          "$ref": "#/definitions/BlobFlatListSegment"
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "ListBlobsHierarchySegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "An enumeration of blobs",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "ContainerName",
-        "Prefix",
-        "Marker",
-        "MaxResults",
-        "Delimiter",
-        "Segment",
-        "NextMarker"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "ContainerName": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "Delimiter": {
-          "type": "string"
-        },
-        "Segment": {
-          "$ref": "#/definitions/BlobHierarchyListSegment"
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "BlobFlatListSegment": {
-      "xml": {
-        "name": "Blobs"
-      },
-      "required": [
-        "BlobItems"
-      ],
-      "type": "object",
-      "properties": {
-        "BlobItems": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/BlobItem"
-          }
-        }
-      }
-    },
-    "BlobHierarchyListSegment": {
-      "xml": {
-        "name": "Blobs"
-      },
-      "type": "object",
-      "required": [
-        "BlobItems"
-      ],
-      "properties": {
-        "BlobPrefixes": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/BlobPrefix"
-          }
-        },
-        "BlobItems": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/BlobItem"
-          }
-        }
-      }
-    },
-    "BlobPrefix": {
-      "type": "object",
-      "required": [
-        "Name"
-      ],
-      "properties": {
-        "Name": {
-          "type": "string"
-        }
-      }
-    },
-    "Block": {
-      "type": "object",
-      "required": [
-        "Name",
-        "Size"
-      ],
-      "description": "Represents a single block in a block blob.  It describes the block's ID and size.",
-      "properties": {
-        "Name": {
-          "description": "The base64 encoded block ID.",
-          "type": "string"
-        },
-        "Size": {
-          "description": "The block size in bytes.",
-          "type": "integer"
-        }
-      }
-    },
-    "BlockList": {
-      "type": "object",
-      "properties": {
-        "CommittedBlocks": {
-          "xml": {
-            "wrapped": true
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Block"
-          }
-        },
-        "UncommittedBlocks": {
-          "xml": {
-            "wrapped": true
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Block"
-          }
-        }
-      }
-    },
-    "BlockLookupList": {
-      "type": "object",
-      "properties": {
-        "Committed": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "xml": {
-              "name": "Committed"
-            }
-          }
-        },
-        "Uncommitted": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "xml": {
-              "name": "Uncommitted"
-            }
-          }
-        },
-        "Latest": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "xml": {
-              "name": "Latest"
-            }
-          }
-        }
-      },
-      "xml": {
-        "name": "BlockList"
-      }
-    },
-    "ContainerItem": {
-      "xml": {
-        "name": "Container"
-      },
-      "type": "object",
-      "required": [
-        "Name",
-        "Properties"
-      ],
-      "description": "An Azure Storage container",
-      "properties": {
-        "Name": {
-          "type": "string"
-        },
-        "Properties": {
-          "$ref": "#/definitions/ContainerProperties"
-        },
-        "Metadata": {
-          "$ref": "#/definitions/ContainerMetadata"
-        }
-      }
-    },
-    "ContainerProperties": {
-      "type": "object",
-      "required": [
-        "Last-Modified",
-        "Etag"
-      ],
-      "description": "Properties of a container",
-      "properties": {
-        "Last-Modified": {
-          "type": "string",
-          "format": "date-time-rfc1123"
-        },
-        "Etag": {
-          "type": "string",
-          "format": "etag"
-        },
-        "LeaseStatus": {
-          "$ref": "#/definitions/LeaseStatus"
-        },
-        "LeaseState": {
-          "$ref": "#/definitions/LeaseState"
-        },
-        "LeaseDuration": {
-          "$ref": "#/definitions/LeaseDuration"
-        },
-        "PublicAccess": {
-          "$ref": "#/definitions/PublicAccessType"
-        },
-        "HasImmutabilityPolicy": {
-          "type": "boolean"
-        },
-        "HasLegalHold": {
-          "type": "boolean"
-        }
-      }
-    },
-    "ListContainersSegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "An enumeration of containers",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "Prefix",
-        "MaxResults",
-        "NextMarker",
-        "ContainerItems"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "ContainerItems": {
-          "xml": {
-            "wrapped": true,
-            "name": "Containers"
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ContainerItem"
-          }
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "CorsRule": {
-      "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
-      "type": "object",
-      "required": [
-        "AllowedOrigins",
-        "AllowedMethods",
-        "AllowedHeaders",
-        "ExposedHeaders",
-        "MaxAgeInSeconds"
-      ],
-      "properties": {
-        "AllowedOrigins": {
-          "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
-          "type": "string"
-        },
-        "AllowedMethods": {
-          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
-          "type": "string"
-        },
-        "AllowedHeaders": {
-          "description": "the request headers that the origin domain may specify on the CORS request.",
-          "type": "string"
-        },
-        "ExposedHeaders": {
-          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
-          "type": "string"
-        },
-        "MaxAgeInSeconds": {
-          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
-          "type": "integer",
-          "minimum": 0
-        }
-      }
-    },
-    "ErrorCode": {
-      "description": "Error codes returned by the service",
-      "type": "string",
-      "enum": [
-        "AccountAlreadyExists",
-        "AccountBeingCreated",
-        "AccountIsDisabled",
-        "AuthenticationFailed",
-        "AuthorizationFailure",
-        "ConditionHeadersNotSupported",
-        "ConditionNotMet",
-        "EmptyMetadataKey",
-        "InsufficientAccountPermissions",
-        "InternalError",
-        "InvalidAuthenticationInfo",
-        "InvalidHeaderValue",
-        "InvalidHttpVerb",
-        "InvalidInput",
-        "InvalidMd5",
-        "InvalidMetadata",
-        "InvalidQueryParameterValue",
-        "InvalidRange",
-        "InvalidResourceName",
-        "InvalidUri",
-        "InvalidXmlDocument",
-        "InvalidXmlNodeValue",
-        "Md5Mismatch",
-        "MetadataTooLarge",
-        "MissingContentLengthHeader",
-        "MissingRequiredQueryParameter",
-        "MissingRequiredHeader",
-        "MissingRequiredXmlNode",
-        "MultipleConditionHeadersNotSupported",
-        "OperationTimedOut",
-        "OutOfRangeInput",
-        "OutOfRangeQueryParameterValue",
-        "RequestBodyTooLarge",
-        "ResourceTypeMismatch",
-        "RequestUrlFailedToParse",
-        "ResourceAlreadyExists",
-        "ResourceNotFound",
-        "ServerBusy",
-        "UnsupportedHeader",
-        "UnsupportedXmlNode",
-        "UnsupportedQueryParameter",
-        "UnsupportedHttpVerb",
-        "AppendPositionConditionNotMet",
-        "BlobAlreadyExists",
-        "BlobNotFound",
-        "BlobOverwritten",
-        "BlobTierInadequateForContentLength",
-        "BlockCountExceedsLimit",
-        "BlockListTooLong",
-        "CannotChangeToLowerTier",
-        "CannotVerifyCopySource",
-        "ContainerAlreadyExists",
-        "ContainerBeingDeleted",
-        "ContainerDisabled",
-        "ContainerNotFound",
-        "ContentLengthLargerThanTierLimit",
-        "CopyAcrossAccountsNotSupported",
-        "CopyIdMismatch",
-        "FeatureVersionMismatch",
-        "IncrementalCopyBlobMismatch",
-        "IncrementalCopyOfEralierVersionSnapshotNotAllowed",
-        "IncrementalCopySourceMustBeSnapshot",
-        "InfiniteLeaseDurationRequired",
-        "InvalidBlobOrBlock",
-        "InvalidBlobTier",
-        "InvalidBlobType",
-        "InvalidBlockId",
-        "InvalidBlockList",
-        "InvalidOperation",
-        "InvalidPageRange",
-        "InvalidSourceBlobType",
-        "InvalidSourceBlobUrl",
-        "InvalidVersionForPageBlobOperation",
-        "LeaseAlreadyPresent",
-        "LeaseAlreadyBroken",
-        "LeaseIdMismatchWithBlobOperation",
-        "LeaseIdMismatchWithContainerOperation",
-        "LeaseIdMismatchWithLeaseOperation",
-        "LeaseIdMissing",
-        "LeaseIsBreakingAndCannotBeAcquired",
-        "LeaseIsBreakingAndCannotBeChanged",
-        "LeaseIsBrokenAndCannotBeRenewed",
-        "LeaseLost",
-        "LeaseNotPresentWithBlobOperation",
-        "LeaseNotPresentWithContainerOperation",
-        "LeaseNotPresentWithLeaseOperation",
-        "MaxBlobSizeConditionNotMet",
-        "NoPendingCopyOperation",
-        "OperationNotAllowedOnIncrementalCopyBlob",
-        "PendingCopyOperation",
-        "PreviousSnapshotCannotBeNewer",
-        "PreviousSnapshotNotFound",
-        "PreviousSnapshotOperationNotSupported",
-        "SequenceNumberConditionNotMet",
-        "SequenceNumberIncrementTooLarge",
-        "SnapshotCountExceeded",
-        "SnaphotOperationRateExceeded",
-        "SnapshotsPresent",
-        "SourceConditionNotMet",
-        "SystemInUse",
-        "TargetConditionNotMet",
-        "UnauthorizedBlobOverwrite",
-        "BlobBeingRehydrated",
-        "BlobArchived",
-        "BlobNotArchived"
-      ],
-      "x-ms-enum": {
-        "name": "StorageErrorCode",
-        "modelAsString": true
-      }
-    },
-    "GeoReplication": {
-      "description": "Geo-Replication information for the Secondary Storage Service",
-      "type": "object",
-      "required": [
-        "Status",
-        "LastSyncTime"
-      ],
-      "properties": {
-        "Status": {
-          "description": "The status of the secondary location",
-          "type": "string",
-          "enum": [
-            "live",
-            "bootstrap",
-            "unavailable"
-          ],
-          "x-ms-enum": {
-            "name": "GeoReplicationStatusType",
-            "modelAsString": true
-          }
-        },
-        "LastSyncTime": {
-          "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
-          "type": "string",
-          "format": "date-time-rfc1123"
-        }
-      }
-    },
-    "Logging": {
-      "description": "Azure Analytics Logging settings.",
-      "type": "object",
-      "required": [
-        "Version",
-        "Delete",
-        "Read",
-        "Write",
-        "RetentionPolicy"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Delete": {
-          "description": "Indicates whether all delete requests should be logged.",
-          "type": "boolean"
-        },
-        "Read": {
-          "description": "Indicates whether all read requests should be logged.",
-          "type": "boolean"
-        },
-        "Write": {
-          "description": "Indicates whether all write requests should be logged.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "ContainerMetadata": {
-      "type": "object",
-      "xml": {
-        "name": "Metadata"
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "BlobMetadata": {
-      "type": "object",
-      "xml": {
-        "name": "Metadata"
-      },
-      "properties": {
-        "Encrypted": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        }
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "Metrics": {
-      "description": "a summary of request statistics grouped by API in hour or minute aggregates for blobs",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Enabled": {
-          "description": "Indicates whether metrics are enabled for the Blob service.",
-          "type": "boolean"
-        },
-        "IncludeAPIs": {
-          "description": "Indicates whether metrics should generate summary statistics for called API operations.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "PageList": {
-      "description": "the list of pages",
-      "type": "object",
-      "properties": {
-        "PageRange": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/PageRange"
-          }
-        },
-        "ClearRange": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ClearRange"
-          }
-        }
-      }
-    },
-    "PageRange": {
-      "type": "object",
-      "required": [
-        "Start",
-        "End"
-      ],
-      "properties": {
-        "Start": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "Start"
-          }
-        },
-        "End": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "End"
-          }
-        }
-      },
-      "xml": {
-        "name": "PageRange"
-      }
-    },
-    "ClearRange": {
-      "type": "object",
-      "required": [
-        "Start",
-        "End"
-      ],
-      "properties": {
-        "Start": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "Start"
-          }
-        },
-        "End": {
-          "type": "integer",
-          "format": "int64",
-          "xml": {
-            "name": "End"
-          }
-        }
-      },
-      "xml": {
-        "name": "ClearRange"
-      }
-    },
-    "RetentionPolicy": {
-      "description": "the retention policy which determines how long the associated data should persist",
-      "type": "object",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Enabled": {
-          "description": "Indicates whether a retention policy is enabled for the storage service",
-          "type": "boolean"
-        },
-        "Days": {
-          "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
-          "type": "integer",
-          "minimum": 1
-        }
-      }
-    },
-    "SignedIdentifier": {
-      "description": "signed identifier",
-      "type": "object",
-      "required": [
-        "Id",
-        "AccessPolicy"
-      ],
-      "properties": {
-        "Id": {
-          "type": "string",
-          "description": "a unique id"
-        },
-        "AccessPolicy": {
-          "$ref": "#/definitions/AccessPolicy"
-        }
-      }
-    },
-    "SignedIdentifiers": {
-      "description": "a collection of signed identifiers",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/SignedIdentifier",
-        "xml": {
-          "name": "SignedIdentifier"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "SignedIdentifiers"
-      }
-    },
-    "StaticWebsite": {
-      "description": "The properties that enable an account to host a static website",
-      "type": "object",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Enabled": {
-          "description": "Indicates whether this account is hosting a static website",
-          "type": "boolean"
-        },
-        "IndexDocument": {
-          "description": "The default name of the index page under each directory",
-          "type": "string"
-        },
-        "ErrorDocument404Path": {
-          "description": "The absolute path of the custom 404 page",
-          "type": "string"
-        }
-      }
-    },
-    "StorageServiceProperties": {
-      "description": "Storage Service Properties.",
-      "type": "object",
-      "properties": {
-        "Logging": {
-          "$ref": "#/definitions/Logging"
-        },
-        "HourMetrics": {
-          "$ref": "#/definitions/Metrics"
-        },
-        "MinuteMetrics": {
-          "$ref": "#/definitions/Metrics"
-        },
-        "Cors": {
-          "description": "The set of CORS rules.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/CorsRule"
-          },
-          "xml": {
-            "wrapped": true
-          }
-        },
-        "DefaultServiceVersion": {
-          "description": "The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions",
-          "type": "string"
-        },
-        "DeleteRetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        },
-        "StaticWebsite": {
-          "$ref": "#/definitions/StaticWebsite"
-        }
-      }
-    },
-    "StorageServiceStats": {
-      "description": "Stats for the storage service.",
-      "type": "object",
-      "properties": {
-        "GeoReplication": {
-          "$ref": "#/definitions/GeoReplication"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "Url": {
-      "name": "url",
-      "description": "The URL of the service account, container, or blob that is the targe of the desired operation.",
-      "required": true,
-      "type": "string",
-      "in": "path",
-      "x-ms-skip-url-encoding": true
-    },
-    "ApiVersionParameter": {
-      "name": "x-ms-version",
-      "x-ms-client-name": "version",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "description": "Specifies the version of the operation to use for this request.",
-      "enum": [
-        "2018-11-09"
-      ]
-    },
-    "Blob": {
-      "name": "blob",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+)*(?:\\.[a-zA-Z0-9]+){0,1}$",
-      "minLength": 1,
-      "maxLength": 1024,
-      "x-ms-parameter-location": "method",
-      "description": "The blob name."
-    },
-    "BlobCacheControl": {
-      "name": "x-ms-blob-cache-control",
-      "x-ms-client-name": "blobCacheControl",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's cache control. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobConditionAppendPos": {
-      "name": "x-ms-blob-condition-appendpos",
-      "x-ms-client-name": "appendPosition",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "append-position-access-conditions"
-      },
-      "description": "Optional conditional header, used only for the Append Block operation. A number indicating the byte offset to compare. Append Block will succeed only if the append position is equal to this number. If it is not, the request will fail with the AppendPositionConditionNotMet error (HTTP status code 412 - Precondition Failed)."
-    },
-    "BlobConditionMaxSize": {
-      "name": "x-ms-blob-condition-maxsize",
-      "x-ms-client-name": "maxSize",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "append-position-access-conditions"
-      },
-      "description": "Optional conditional header. The max length in bytes permitted for the append blob. If the Append Block operation would cause the blob to exceed that limit or if the blob size is already greater than the value specified in this header, the request will fail with MaxBlobSizeConditionNotMet error (HTTP status code 412 - Precondition Failed)."
-    },
-    "BlobPublicAccess": {
-      "name": "x-ms-blob-public-access",
-      "x-ms-client-name": "access",
-      "in": "header",
-      "required": false,
-      "x-ms-parameter-location": "method",
-      "description": "Specifies whether data in the container may be accessed publicly and the level of access",
-      "type": "string",
-      "enum": [
-        "container",
-        "blob"
-      ],
-      "x-ms-enum": {
-        "name": "PublicAccessType",
-        "modelAsString": true
-      }
-    },
-    "AccessTier": {
-      "name": "x-ms-access-tier",
-      "x-ms-client-name": "tier",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "enum": [
-        "P4",
-        "P6",
-        "P10",
-        "P20",
-        "P30",
-        "P40",
-        "P50",
-        "Hot",
-        "Cool",
-        "Archive"
-      ],
-      "x-ms-enum": {
-        "name": "AccessTier",
-        "modelAsString": true
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Indicates the tier to be set on the blob."
-    },
-    "BlobContentDisposition": {
-      "name": "x-ms-blob-content-disposition",
-      "x-ms-client-name": "blobContentDisposition",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's Content-Disposition header."
-    },
-    "BlobContentEncoding": {
-      "name": "x-ms-blob-content-encoding",
-      "x-ms-client-name": "blobContentEncoding",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's content encoding. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobContentLanguage": {
-      "name": "x-ms-blob-content-language",
-      "x-ms-client-name": "blobContentLanguage",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Set the blob's content language. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobContentLengthOptional": {
-      "name": "x-ms-blob-content-length",
-      "x-ms-client-name": "blobContentLength",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
-    },
-    "BlobContentLengthRequired": {
-      "name": "x-ms-blob-content-length",
-      "x-ms-client-name": "blobContentLength",
-      "in": "header",
-      "required": true,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "This header specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary."
-    },
-    "BlobContentMD5": {
-      "name": "x-ms-blob-content-md5",
-      "x-ms-client-name": "blobContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded."
-    },
-    "BlobContentType": {
-      "name": "x-ms-blob-content-type",
-      "x-ms-client-name": "blobContentType",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "blob-HTTP-headers"
-      },
-      "description": "Optional. Sets the blob's content type. If specified, this property is stored with the blob and returned with a read request."
-    },
-    "BlobSequenceNumber": {
-      "name": "x-ms-blob-sequence-number",
-      "x-ms-client-name": "blobSequenceNumber",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "default": 0,
-      "x-ms-parameter-location": "method",
-      "description": "Set for page blobs only. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1."
-    },
-    "BlockId": {
-      "name": "blockid",
-      "x-ms-client-name": "blockId",
-      "in": "query",
-      "type": "string",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "description": "A valid Base64 string value that identifies the block. Prior to encoding, the string must be less than or equal to 64 bytes in size. For a given blob, the length of the value specified for the blockid parameter must be the same size for each block."
-    },
-    "BlockListType": {
-      "name": "blocklisttype",
-      "x-ms-client-name": "listType",
-      "in": "query",
-      "required": true,
-      "default": "committed",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies whether to return the list of committed blocks, the list of uncommitted blocks, or both lists together.",
-      "type": "string",
-      "enum": [
-        "committed",
-        "uncommitted",
-        "all"
-      ],
-      "x-ms-enum": {
-        "name": "BlockListType",
-        "modelAsString": false
-      }
-    },
-    "Body": {
-      "name": "body",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "type": "object",
-        "format": "file"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Initial data"
-    },
-    "CacheControl": {
-      "name": "Cache-Control",
-      "x-ms-client-name": "cacheControl",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Cache control for given resource"
-    },
-    "ContainerAcl": {
-      "name": "containerAcl",
-      "in": "body",
-      "schema": {
-        "$ref": "#/definitions/SignedIdentifiers"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "the acls for the container"
-    },
-    "CopyId": {
-      "name": "copyid",
-      "x-ms-client-name": "copyId",
-      "in": "query",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The copy identifier provided in the x-ms-copy-id header of the original Copy Blob operation."
-    },
-    "ClientRequestId": {
-      "name": "x-ms-client-request-id",
-      "x-ms-client-name": "requestId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled."
-    },
-    "ContainerName": {
-      "name": "containerName",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The container name."
-    },
-    "ContentCrc64": {
-      "name": "x-ms-content-crc64",
-      "x-ms-client-name": "transactionalContentCrc64",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "description": "Specify the transactional crc64 for the body, to be validated by the service."
-    },
-    "ContentLength": {
-      "name": "Content-Length",
-      "in": "header",
-      "required": true,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "The length of the request."
-    },
-    "ContentMD5": {
-      "name": "Content-MD5",
-      "x-ms-client-name": "transactionalContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "description": "Specify the transactional md5 for the body, to be validated by the service."
-    },
-    "CopySource": {
-      "name": "x-ms-copy-source",
-      "x-ms-client-name": "copySource",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "format": "url",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the name of the source page blob snapshot. This value is a URL of up to 2 KB in length that specifies a page blob snapshot. The value should be URL-encoded as it would appear in a request URI. The source blob must either be public or must be authenticated via a shared access signature."
-    },
-    "DeleteSnapshots": {
-      "name": "x-ms-delete-snapshots",
-      "x-ms-client-name": "deleteSnapshots",
-      "description": "Required if the blob has associated snapshots. Specify one of the following two options: include: Delete the base blob and all of its snapshots. only: Delete only the blob's snapshots and not the blob itself",
-      "x-ms-parameter-location": "method",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "enum": [
-        "include",
-        "only"
-      ],
-      "x-ms-enum": {
-        "name": "DeleteSnapshotsOptionType",
-        "modelAsString": false
-      }
-    },
-    "Delimiter": {
-      "name": "delimiter",
-      "description": "When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.",
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "in": "query",
-      "required": true
-    },
-    "EncryptionKey": {
-      "name": "x-ms-encryption-key",
-      "x-ms-client-name": "EncryptionKey",
-      "type": "string",
-      "in": "query",
-      "required": false,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the encryption key to use to encrypt the data provided in the request. If not specified, encryption is performed with the root account encryption key.  For more information, see Encryption at Rest for Azure Storage Services."
-    },
-    "EncryptionKeySha256": {
-      "name": "x-ms-encryption-key-sha256",
-      "x-ms-client-name": "encryptionKeySha256",
-      "type": "string",
-      "in": "query",
-      "required": false,
-      "x-ms-parameter-location": "method",
-      "description": "The SHA-256 hash of the provided encryption key. Must be provided if the x-ms-encryption-key header is provided."
-    },
-    "EncryptionAlgorithm": {
-      "name": "x-ms-encryption-algorithm",
-      "x-ms-client-name": "EncryptionAlgorithm",
-      "type": "string",
-      "in": "query",
-      "required": false,
-      "enum": [
-        "AES256"
-      ],
-      "x-ms-enum": {
-        "name": "EncryptionAlgorithmType",
-        "modelAsString": false
-      },
-      "x-ms-parameter-location": "method",
-      "description": "The algorithm used to produce the encryption key hash. Currently, the only accepted value is \"AES256\". Must be provided if the x-ms-encryption-key header is provided."
-    },
-    "GetRangeContentMD5": {
-      "name": "x-ms-range-get-content-md5",
-      "x-ms-client-name": "rangeGetContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "boolean",
-      "x-ms-parameter-location": "method",
-      "description": "When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size."
-    },
-    "IfMatch": {
-      "name": "If-Match",
-      "x-ms-client-name": "ifMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs with a matching value."
-    },
-    "IfModifiedSince": {
-      "name": "If-Modified-Since",
-      "x-ms-client-name": "ifModifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
-    },
-    "IfNoneMatch": {
-      "name": "If-None-Match",
-      "x-ms-client-name": "ifNoneMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs without a matching value."
-    },
-    "IfUnmodifiedSince": {
-      "name": "If-Unmodified-Since",
-      "x-ms-client-name": "ifUnmodifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
-    },
-    "IfSequenceNumberEqualTo": {
-      "name": "x-ms-if-sequence-number-eq",
-      "x-ms-client-name": "ifSequenceNumberEqualTo",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "sequence-number-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has the specified sequence number."
-    },
-    "IfSequenceNumberLessThan": {
-      "name": "x-ms-if-sequence-number-lt",
-      "x-ms-client-name": "ifSequenceNumberLessThan",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "sequence-number-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has a sequence number less than the specified."
-    },
-    "IfSequenceNumberLessThanOrEqualTo": {
-      "name": "x-ms-if-sequence-number-le",
-      "x-ms-client-name": "ifSequenceNumberLessThanOrEqualTo",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "sequence-number-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has a sequence number less than or equal to the specified."
-    },
-    "KeyInfo": {
-      "name": "KeyInfo",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/KeyInfo"
-      }
-    },
-    "ListBlobsInclude": {
-      "name": "include",
-      "in": "query",
-      "required": false,
-      "type": "array",
-      "collectionFormat": "csv",
-      "items": {
-        "type": "string",
-        "enum": [
-          "copy",
-          "deleted",
-          "metadata",
-          "snapshots",
-          "uncommittedblobs"
-        ],
-        "x-ms-enum": {
-          "name": "ListBlobsIncludeItem",
-          "modelAsString": false
-        }
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Include this parameter to specify one or more datasets to include in the response."
-    },
-    "ListContainersInclude": {
-      "name": "include",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "enum": [
-        "metadata"
-      ],
-      "x-ms-enum": {
-        "name": "ListContainersIncludeType",
-        "modelAsString": false
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Include this parameter to specify that the container's metadata be returned as part of the response body."
-    },
-    "LeaseBreakPeriod": {
-      "name": "x-ms-lease-break-period",
-      "x-ms-client-name": "breakPeriod",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "x-ms-parameter-location": "method",
-      "description": "For a break operation, proposed duration the lease should continue before it is broken, in seconds, between 0 and 60. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately."
-    },
-    "LeaseDuration": {
-      "name": "x-ms-lease-duration",
-      "x-ms-client-name": "duration",
-      "in": "header",
-      "required": false,
-      "type": "integer",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change."
-    },
-    "LeaseIdOptional": {
-      "name": "x-ms-lease-id",
-      "x-ms-client-name": "leaseId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "lease-access-conditions"
-      },
-      "description": "If specified, the operation only succeeds if the resource's lease is active and matches this ID."
-    },
-    "LeaseIdRequired": {
-      "name": "x-ms-lease-id",
-      "x-ms-client-name": "leaseId",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the current lease ID on the resource."
-    },
-    "Marker": {
-      "name": "marker",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
-      "x-ms-parameter-location": "method"
-    },
-    "MaxResults": {
-      "name": "maxresults",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 1,
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the maximum number of containers to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
-    },
-    "Metadata": {
-      "name": "x-ms-meta",
-      "x-ms-client-name": "metadata",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information.",
-      "x-ms-header-collection-prefix": "x-ms-meta-"
-    },
-    "Prefix": {
-      "name": "prefix",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "Filters the results to return only containers whose name begins with the specified prefix.",
-      "x-ms-parameter-location": "method"
-    },
-    "PrevSnapshot": {
-      "name": "prevsnapshot",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Optional in version 2015-07-08 and newer. The prevsnapshot parameter is a DateTime value that specifies that the response will contain only pages that were changed between target blob and previous snapshot. Changed pages include both updated and cleared pages. The target blob may be a snapshot, as long as the snapshot specified by prevsnapshot is the older of the two. Note that incremental snapshots are currently supported only for blobs created on or after January 1, 2016."
-    },
-    "ProposedLeaseIdOptional": {
-      "name": "x-ms-proposed-lease-id",
-      "x-ms-client-name": "proposedLeaseId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
-    },
-    "ProposedLeaseIdRequired": {
-      "name": "x-ms-proposed-lease-id",
-      "x-ms-client-name": "proposedLeaseId",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format. See Guid Constructor (String) for a list of valid GUID string formats."
-    },
-    "Range": {
-      "name": "x-ms-range",
-      "x-ms-client-name": "range",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Return only the bytes of the blob in the specified range."
-    },
-    "RangeRequiredPutPageFromUrl": {
-      "name": "x-ms-range",
-      "x-ms-client-name": "range",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The range of bytes to which the source range would be written. The range should be 512 aligned and range-end is required."
-    },
-    "SequenceNumberAction": {
-      "name": "x-ms-sequence-number-action",
-      "x-ms-client-name": "sequenceNumberAction",
-      "in": "header",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "description": "Required if the x-ms-blob-sequence-number header is set for the request. This property applies to page blobs only. This property indicates how the service should modify the blob's sequence number",
-      "type": "string",
-      "enum": [
-        "max",
-        "update",
-        "increment"
-      ],
-      "x-ms-enum": {
-        "name": "SequenceNumberActionType",
-        "modelAsString": false
-      }
-    },
-    "Snapshot": {
-      "name": "snapshot",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve. For more information on working with blob snapshots, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/creating-a-snapshot-of-a-blob\">Creating a Snapshot of a Blob.</a>"
-    },
-    "SourceContentMD5": {
-      "name": "x-ms-source-content-md5",
-      "x-ms-client-name": "sourceContentMD5",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "byte",
-      "x-ms-parameter-location": "method",
-      "description": "Specify the md5 calculated for the range of bytes that must be read from the copy source."
-    },
-    "SourceRange": {
-      "name": "x-ms-source-range",
-      "x-ms-client-name": "sourceRange",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Bytes of source data in the specified range."
-      },
-      "SourceRangeRequiredPutPageFromUrl": {
-        "name": "x-ms-source-range",
-        "x-ms-client-name": "sourceRange",
-        "in": "header",
-        "required": true,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "description": "Bytes of source data in the specified range. The length of this range should match the ContentLength header and x-ms-range/Range destination range header."
-    },
-    "SourceIfMatch": {
-      "name": "x-ms-source-if-match",
-      "x-ms-client-name": "sourceIfMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs with a matching value."
-    },
-    "SourceIfModifiedSince": {
-      "name": "x-ms-source-if-modified-since",
-      "x-ms-client-name": "sourceIfModifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has been modified since the specified date/time."
-    },
-    "SourceIfNoneMatch": {
-      "name": "x-ms-source-if-none-match",
-      "x-ms-client-name": "sourceIfNoneMatch",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "etag",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify an ETag value to operate only on blobs without a matching value."
-    },
-    "SourceIfUnmodifiedSince": {
-      "name": "x-ms-source-if-unmodified-since",
-      "x-ms-client-name": "sourceIfUnmodifiedSince",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "format": "date-time-rfc1123",
-      "x-ms-parameter-location": "method",
-      "x-ms-parameter-grouping": {
-        "name": "source-modified-access-conditions"
-      },
-      "description": "Specify this header value to operate only on a blob if it has not been modified since the specified date/time."
-    },
-      "SourceLeaseId": {
-        "name": "x-ms-source-lease-id",
-        "x-ms-client-name": "sourceLeaseId",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "description": "A lease ID for the source path. If specified, the source path must have an active lease and the leaase ID must match."
-      },
-    "SourceUrl": {
-      "name": "x-ms-copy-source",
-      "x-ms-client-name": "sourceUrl",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "format": "url",
-      "x-ms-parameter-location": "method",
-      "description": "Specify a URL to the copy source."
-    },
-    "StorageServiceProperties": {
-      "name": "StorageServiceProperties",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/StorageServiceProperties"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "The StorageService properties."
-    },
-    "Timeout": {
-      "name": "timeout",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 0,
-      "x-ms-parameter-location": "method",
-      "description": "The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations\">Setting Timeouts for Blob Service Operations.</a>"
-      },
-      "VersionId": {
-        "name": "versionid",
-        "x-ms-client-name": "versionId",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "description": "The version ID parameter is an opaque DateTime value that, when present, specifies the blob version to retrieve."
-      },
-      "XMsCacheControl": {
-        "name": "x-ms-cache-control",
-        "x-ms-client-name": "cacheControl",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Cache control for given resource"
-      },
-      "XMsContentType": {
-        "name": "x-ms-content-type",
-        "x-ms-client-name": "contentType",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content type for given resource"
-      },
-      "XMsContentEncoding": {
-        "name": "x-ms-content-encoding",
-        "x-ms-client-name": "contentEncoding",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content encoding for given resource"
-      },
-      "XMsContentLanguage": {
-        "name": "x-ms-content-language",
-        "x-ms-client-name": "contentLanguage",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content language for given resource"
-      },
-      "XMsContentDisposition": {
-        "name": "x-ms-content-disposition",
-        "x-ms-client-name": "contentDisposition",
-        "in": "header",
-        "required": false,
-        "type": "string",
-        "x-ms-parameter-location": "method",
-        "x-ms-parameter-grouping": {
-          "name": "directory-http-headers"
-        },
-        "description": "Content disposition for given resource"
-    }
-  }
-}
diff --git a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
index 39584a1738f9..61cd8b5218c9 100644
--- a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
+++ b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
@@ -67,14 +67,15 @@ public AzureFileStorageBuilder pipeline(HttpPipeline pipeline) {
      * @return an instance of AzureFileStorageImpl.
      */
     public AzureFileStorageImpl build() {
+        if (version == null) {
+            this.version = "2018-11-09";
+        }
         if (pipeline == null) {
             this.pipeline = RestProxy.createDefaultPipeline();
         }
         AzureFileStorageImpl client = new AzureFileStorageImpl(pipeline);
         if (this.version != null) {
             client.setVersion(this.version);
-        } else {
-            client.setVersion("2018-11-09");
         }
         if (this.url != null) {
             client.setUrl(this.url);
diff --git a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java
index 54e5f47f763f..5d154709eec4 100644
--- a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java
+++ b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageImpl.java
@@ -29,9 +29,11 @@ public String getVersion() {
      * Sets Specifies the version of the operation to use for this request.
      *
      * @param version the version value.
+     * @return the service client itself.
      */
-    void setVersion(String version) {
+    AzureFileStorageImpl setVersion(String version) {
         this.version = version;
+        return this;
     }
 
     /**
@@ -52,9 +54,11 @@ public String getUrl() {
      * Sets The URL of the service account, share, directory or file that is the target of the desired operation.
      *
      * @param url the url value.
+     * @return the service client itself.
      */
-    void setUrl(String url) {
+    AzureFileStorageImpl setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     /**
diff --git a/sdk/storage/azure-storage-file/swagger/README.md b/sdk/storage/azure-storage-file/swagger/README.md
new file mode 100644
index 000000000000..e27a308da24c
--- /dev/null
+++ b/sdk/storage/azure-storage-file/swagger/README.md
@@ -0,0 +1,446 @@
+# Azure File Storage for Java
+
+> see https://aka.ms/autorest
+
+### Setup
+```ps
+cd C:\work
+git clone --recursive https://github.com/Azure/autorest.java/
+cd autorest.java
+git checkout v3
+npm install
+cd ..
+git clone --recursive https://github.com/jianghaolu/autorest.modeler/
+cd autorest.modeler
+git checkout headerprefixfix
+npm install
+```
+
+### Generation
+```ps
+cd <swagger-folder>
+autorest --use=C:/work/autorest.java --use=C:/work/autorest.modeler --version=2.0.4280
+```
+
+### Code generation settings
+``` yaml
+input-file: ./file-2018-11-09.json
+java: true
+output-folder: ../
+namespace: com.azure.storage.file
+enable-xml: true
+generate-client-interfaces: false
+sync-methods: none
+license-header: MICROSOFT_MIT_SMALL
+add-context-parameter: true
+```
+
+### Query Parameters
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters
+  transform: >
+    if (!$.DirectoryPath) {
+        $.DirectoryPath = {
+            "name": "directoryPath",
+            "in": "path",
+            "description": "The path of the target directory.",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-skip-url-encoding": false
+        };
+    }
+    if (!$.FilePath) {
+        $.FilePath = {
+            "name": "filePath",
+            "in": "path",
+            "description": "The path of the target file.",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-skip-url-encoding": false
+        };
+    }
+    if (!$.ShareName) {
+        $.ShareName = {
+            "name": "shareName",
+            "in": "path",
+            "description": "The name of the target share.",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        };
+    }
+```
+
+### FileServiceProperties
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions
+  transform: >
+    if (!$.FileServiceProperties) {
+        const props = $.FileServiceProperties = $.StorageServiceProperties;
+        props.xml = { "name": "StorageServiceProperties" };
+        delete $.StorageServiceProperties;
+    }
+- from: swagger-document
+  where: $.parameters
+  transform: >
+    if (!$.FileServiceProperties) {
+        const props = $.FileServiceProperties = $.StorageServiceProperties;
+        props.name = "FileServiceProperties";
+        props.description = "The FileStorage properties.";
+        props.schema = { "$ref": props.schema.$ref.replace(/[#].*$/, "#/definitions/FileServiceProperties") };
+        delete $.StorageServiceProperties;
+    }
+- from: swagger-document
+  where: $["x-ms-paths"]["/?restype=service&comp=properties"]
+  transform: >
+    const param = $.put.parameters[0];
+    if (param && param["$ref"] && param["$ref"].endsWith("StorageServiceProperties")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/FileServiceProperties");
+        $.put.parameters[0] = { "$ref": path };
+    }
+    const def = $.get.responses["200"].schema;
+    if (def && def["$ref"] && def["$ref"].endsWith("StorageServiceProperties")) {
+        const path = def["$ref"].replace(/[#].*$/, "#/definitions/FileServiceProperties");
+        $.get.responses["200"].schema = { "$ref": path };
+    }
+```
+
+### /{shareName}?restype=share
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=properties"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=snapshot
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=snapshot"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}?restype=share&comp=acl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=acl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+
+### /{shareName}?restype=share&comp=stats
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{shareName}?restype=share&comp=stats"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("ShareName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/ShareName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{shareName}/{directoryPath}?restype=directory
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?restype=directory"]) {
+        const op = $["/{shareName}/{directoryPath}?restype=directory"] = $["/{shareName}/{directory}?restype=directory"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        op.delete.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.delete.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?restype=directory"];
+    }
+```
+
+### /{shareName}/{directoryPath}?restype=directory&comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?restype=directory&comp=metadata"]) {
+        const op = $["/{shareName}/{directoryPath}?restype=directory&comp=metadata"] = $["/{shareName}/{directory}?restype=directory&comp=metadata"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?restype=directory&comp=metadata"];
+    }
+```
+
+### /{shareName}/{directoryPath}?restype=directory&comp=list
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?restype=directory&comp=list"]) {
+        const op = $["/{shareName}/{directoryPath}?restype=directory&comp=list"] = $["/{shareName}/{directory}?restype=directory&comp=list"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?restype=directory&comp=list"];
+    }
+```
+
+### /{shareName}/{directoryPath}?comp=listhandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?comp=listhandles"]) {
+        const op = $["/{shareName}/{directoryPath}?comp=listhandles"] = $["/{shareName}/{directory}?comp=listhandles"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?comp=listhandles"];
+    }
+```
+
+### /{shareName}/{directoryPath}?comp=forceclosehandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{directoryPath}?comp=forceclosehandles"]) {
+        const op = $["/{shareName}/{directoryPath}?comp=forceclosehandles"] = $["/{shareName}/{directory}?comp=forceclosehandles"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "DirectoryPath" });
+        delete $["/{shareName}/{directory}?comp=forceclosehandles"];
+    }
+```
+
+### /{shareName}/{filePath}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}"]) {
+        const op = $["/{shareName}/{filePath}"] = $["/{shareName}/{directory}/{fileName}"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        op.head.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.head.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete op.head.responses.default.schema;
+        op.delete.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.delete.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=properties
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=properties"]) {
+        const op = $["/{shareName}/{filePath}?comp=properties"] = $["/{shareName}/{directory}/{fileName}?comp=properties"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=properties"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=metadata"]) {
+        const op = $["/{shareName}/{filePath}?comp=metadata"] = $["/{shareName}/{directory}/{fileName}?comp=metadata"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=metadata"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=range
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=range"]) {
+        const op = $["/{shareName}/{filePath}?comp=range"] = $["/{shareName}/{directory}/{fileName}?comp=range"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=range"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=rangelist
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=rangelist"]) {
+        const op = $["/{shareName}/{filePath}?comp=rangelist"] = $["/{shareName}/{directory}/{fileName}?comp=rangelist"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=rangelist"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=copy
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=copy"]) {
+        const op = $["/{shareName}/{filePath}?comp=copy"] = $["/{shareName}/{directory}/{fileName}?comp=copy"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=copy"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=copy&copyid={CopyId}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=copy&copyid={CopyId}"]) {
+        const op = $["/{shareName}/{filePath}?comp=copy&copyid={CopyId}"] = $["/{shareName}/{directory}/{fileName}?comp=copy&copyid={CopyId}"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=copy&copyid={CopyId}"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=listhandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=listhandles"]) {
+        const op = $["/{shareName}/{filePath}?comp=listhandles"] = $["/{shareName}/{directory}/{fileName}?comp=listhandles"];
+        const path = op.get.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.get.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.get.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=listhandles"];
+    }
+```
+
+### /{shareName}/{filePath}?comp=forceclosehandles
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]
+  transform: >
+    if (!$["/{shareName}/{filePath}?comp=forceclosehandles"]) {
+        const op = $["/{shareName}/{filePath}?comp=forceclosehandles"] = $["/{shareName}/{directory}/{fileName}?comp=forceclosehandles"];
+        const path = op.put.parameters[0].$ref.replace(/[#].*$/, "#/parameters/");
+        op.put.parameters.splice(0, 0, { "$ref": path + "ShareName" });
+        op.put.parameters.splice(1, 0, { "$ref": path + "FilePath" });
+        delete $["/{shareName}/{directory}/{fileName}?comp=forceclosehandles"];
+    }
+```
+
+### ShareProperties
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions
+  transform: >
+    if (!$.ShareProperties.properties.Metadata) {
+        const path = $.ShareItem.properties.Metadata.$ref;
+        $.ShareProperties.properties.Metadata = { "$ref": path };
+    }
+```
+
+### ShareUsageBytes
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.ShareStats.properties.ShareUsageBytes
+  transform: >
+    $.description = "The approximate size of the data stored in bytes, rounded up to the nearest gigabyte. Note that this value may not include all recently created or recently resized files.";
+    $.format = "int64";
+```
+
+### ApiVersionParameter
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.ApiVersionParameter
+  transform: >
+    $.enum = [ "2018-11-09" ];
+```
diff --git a/sdk/storage/azure-storage-file/swagger/file.json b/sdk/storage/azure-storage-file/swagger/file-2018-11-09.json
similarity index 95%
rename from sdk/storage/azure-storage-file/swagger/file.json
rename to sdk/storage/azure-storage-file/swagger/file-2018-11-09.json
index 26efc70f6af0..fbe80a1d8198 100644
--- a/sdk/storage/azure-storage-file/swagger/file.json
+++ b/sdk/storage/azure-storage-file/swagger/file-2018-11-09.json
@@ -44,7 +44,7 @@
                 "operationId": "Service_SetProperties",
                 "description": "Sets properties for a storage account's File service endpoint, including properties for Storage Analytics metrics and CORS (Cross-Origin Resource Sharing) rules.",
                 "parameters": [{
-                        "$ref": "#/parameters/FileServiceProperties"
+                        "$ref": "#/parameters/StorageServiceProperties"
                     },
                     {
                         "$ref": "#/parameters/Timeout"
@@ -112,7 +112,7 @@
                             }
                         },
                         "schema": {
-                            "$ref": "#/definitions/FileServiceProperties"
+                            "$ref": "#/definitions/StorageServiceProperties"
                         }
                     },
                     "default": {
@@ -228,11 +228,7 @@
                 ],
                 "operationId": "Share_Create",
                 "description": "Creates a new share under the specified account. If the share with the same name already exists, the operation fails.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -296,11 +292,7 @@
                 ],
                 "operationId": "Share_GetProperties",
                 "description": "Returns all user-defined metadata and system properties for the specified share or share snapshot. The data returned does not include the share's list of files.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -372,11 +364,7 @@
                 ],
                 "operationId": "Share_Delete",
                 "description": "Operation marks the specified share or share snapshot for deletion. The share or share snapshot and any files contained within it are later deleted during garbage collection.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -441,11 +429,7 @@
                 ],
                 "operationId": "Share_CreateSnapshot",
                 "description": "Creates a read-only snapshot of a share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -532,11 +516,7 @@
                 ],
                 "operationId": "Share_SetQuota",
                 "description": "Sets quota for the specified share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -618,11 +598,7 @@
                 ],
                 "operationId": "Share_SetMetadata",
                 "description": "Sets one or more user-defined name-value pairs for the specified share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -704,11 +680,7 @@
                 ],
                 "operationId": "Share_GetAccessPolicy",
                 "description": "Returns information about stored access policies specified on the share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -769,11 +741,7 @@
                 ],
                 "operationId": "Share_SetAccessPolicy",
                 "description": "Sets a stored access policy for use with shared access signatures.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareAcl"
                     },
                     {
@@ -855,11 +823,7 @@
                 ],
                 "operationId": "Share_GetStatistics",
                 "description": "Retrieves statistics related to the share.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -934,21 +898,14 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?restype=directory": {
+        "/{shareName}/{directory}?restype=directory": {
             "put": {
                 "tags": [
                     "directory"
                 ],
                 "operationId": "Directory_Create",
                 "description": "Creates a new directory under the specified share or parent directory.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1014,14 +971,7 @@
                 ],
                 "operationId": "Directory_GetProperties",
                 "description": "Returns all system properties for the specified directory, and can also be used to check the existence of a directory. The data returned does not include the files in the directory or any subdirectories.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -1093,14 +1043,7 @@
                 ],
                 "operationId": "Directory_Delete",
                 "description": "Removes the specified empty directory. Note that the directory must be empty before it can be deleted.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1152,21 +1095,14 @@
                 ]
             }]
         },
-        "/{shareName}/{directoryPath}?restype=directory&comp=metadata": {
+        "/{shareName}/{directory}?restype=directory&comp=metadata": {
             "put": {
                 "tags": [
                     "directory"
                 ],
                 "operationId": "Directory_SetMetadata",
                 "description": "Updates user defined metadata for the specified directory.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1241,7 +1177,7 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?restype=directory&comp=list": {
+        "/{shareName}/{directory}?restype=directory&comp=list": {
             "get": {
                 "tags": [
                     "directory"
@@ -1249,12 +1185,6 @@
                 "operationId": "Directory_ListFilesAndDirectoriesSegment",
                 "description": "Returns a list of files or directories under the specified share or directory. It lists the contents only for a single level of the directory hierarchy.",
                 "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
                     {
                         "$ref": "#/parameters/Prefix"
                     },
@@ -1339,7 +1269,7 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?comp=listhandles": {
+        "/{shareName}/{directory}?comp=listhandles": {
             "get":{
                 "tags": [
                     "directory"
@@ -1347,12 +1277,6 @@
                 "operationId": "Directory_ListHandles",
                 "description": "Lists handles for directory.",
                 "parameters":[
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
                     {
                         "$ref": "#/parameters/Marker"
                     },
@@ -1425,7 +1349,7 @@
                 }
             ]
         },
-        "/{shareName}/{directoryPath}?comp=forceclosehandles": {
+        "/{shareName}/{directory}?comp=forceclosehandles": {
             "put": {
                 "tags": [
                     "directory"
@@ -1433,12 +1357,6 @@
                 "operationId": "Directory_ForceCloseHandles",
                 "description": "Closes all handles open for given directory.",
                 "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/DirectoryPath"
-                    },
                     {
                         "$ref": "#/parameters/Timeout"
                     },
@@ -1514,21 +1432,14 @@
             }
         ]
         },
-        "/{shareName}/{filePath}": {
+        "/{shareName}/{directory}/{fileName}": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_Create",
                 "description": "Creates a new file or replaces a file. Note it only initializes the file with no content.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1624,14 +1535,7 @@
                 ],
                 "operationId": "File_Download",
                 "description": "Reads or downloads a file from the system, including its metadata and properties.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -1925,14 +1829,7 @@
                 ],
                 "operationId": "File_GetProperties",
                 "description": "Returns all user-defined metadata, standard HTTP properties, and system properties for the file. It does not return the content of the file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -2070,6 +1967,9 @@
                                 "x-ms-client-name": "ErrorCode",
                                 "type": "string"
                             }
+                        },
+                        "schema": {
+                            "$ref": "#/definitions/StorageError"
                         }
                     }
                 }
@@ -2080,14 +1980,7 @@
                 ],
                 "operationId": "File_Delete",
                 "description": "removes the file from the storage account.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2133,21 +2026,14 @@
 
             ]
         },
-        "/{shareName}/{filePath}?comp=properties": {
+        "/{shareName}/{directory}/{fileName}?comp=properties": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_SetHTTPHeaders",
                 "description": "Sets HTTP headers on the file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2241,21 +2127,14 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=metadata": {
+        "/{shareName}/{directory}/{fileName}?comp=metadata": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_SetMetadata",
                 "description": "Updates user-defined metadata for the specified file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2320,7 +2199,7 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=range": {
+        "/{shareName}/{directory}/{fileName}?comp=range": {
             "put": {
                 "tags": [
                     "file"
@@ -2330,14 +2209,7 @@
                 "consumes": [
                     "application/octet-stream"
                 ],
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/OptionalBody"
                     },
                     {
@@ -2443,21 +2315,14 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=rangelist": {
+        "/{shareName}/{directory}/{fileName}?comp=rangelist": {
             "get": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_GetRangeList",
                 "description": "Returns the list of valid ranges for a file.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/ShareSnapshot"
                     },
                     {
@@ -2539,21 +2404,14 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=copy": {
+        "/{shareName}/{directory}/{fileName}?comp=copy": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_StartCopy",
                 "description": "Copies a blob or file to a destination file within the storage account.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/Timeout"
                     },
                     {
@@ -2635,21 +2493,14 @@
 
             ]
         },
-        "/{shareName}/{filePath}?comp=copy&copyid={CopyId}": {
+        "/{shareName}/{directory}/{fileName}?comp=copy&copyid={CopyId}": {
             "put": {
                 "tags": [
                     "file"
                 ],
                 "operationId": "File_AbortCopy",
                 "description": "Aborts a pending Copy File operation, and leaves a destination file with zero length and full metadata.",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
-                    {
+                "parameters": [{
                         "$ref": "#/parameters/CopyId"
                     },
                     {
@@ -2707,7 +2558,7 @@
                 ]
             }]
         },
-        "/{shareName}/{filePath}?comp=listhandles": {
+        "/{shareName}/{directory}/{fileName}?comp=listhandles": {
             "get":{
                 "tags": [
                     "file"
@@ -2715,12 +2566,6 @@
                 "operationId": "File_ListHandles",
                 "description": "Lists handles for file",
                 "parameters":[
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
                     {
                         "$ref": "#/parameters/Marker"
                     },
@@ -2790,7 +2635,7 @@
                 }
             ]
         },
-        "/{shareName}/{filePath}?comp=forceclosehandles": {
+        "/{shareName}/{directory}/{fileName}?comp=forceclosehandles": {
             "put": {
                 "tags": [
                     "file"
@@ -2798,12 +2643,6 @@
                 "operationId": "File_ForceCloseHandles",
                 "description": "Closes all handles open for given file",
                 "parameters": [
-                    {
-                        "$ref": "#/parameters/ShareName"
-                    },
-                    {
-                        "$ref": "#/parameters/FilePath"
-                    },
                     {
                         "$ref": "#/parameters/Timeout"
                     },
@@ -3383,9 +3222,6 @@
                 },
                 "Quota": {
                     "type": "integer"
-                },
-                "Metadata": {
-                    "$ref": "#/definitions/Metadata"
                 }
             }
         },
@@ -3397,9 +3233,8 @@
             ],
             "properties": {
                 "ShareUsageBytes": {
-                    "description": "The approximate size of the data stored in bytes, rounded up to the nearest gigabyte. Note that this value may not include all recently created or recently resized files.",
-                    "type": "integer",
-                    "format": "int64"
+                    "description": "The approximate size of the data stored in bytes. Note that this value may not include all recently created or recently resized files.",
+                    "type": "integer"
                 }
             }
         },
@@ -3434,7 +3269,7 @@
                 "name": "SignedIdentifiers"
             }
         },
-        "FileServiceProperties": {
+        "StorageServiceProperties": {
             "description": "Storage service properties.",
             "type": "object",
             "properties": {
@@ -3456,9 +3291,6 @@
                         "wrapped": true
                     }
                 }
-            },
-            "xml": {
-                "name": "StorageServiceProperties"
             }
         }
     },
@@ -3469,10 +3301,7 @@
             "in": "header",
             "description": "Specifies the version of the operation to use for this request.",
             "required": true,
-            "type": "string",
-            "enum": [
-                "2018-11-09"
-            ]
+            "type": "string"
         },
         "ContentLength": {
             "name": "Content-Length",
@@ -3539,15 +3368,6 @@
             },
             "x-ms-parameter-location": "method"
         },
-        "DirectoryPath": {
-            "name": "directoryPath",
-            "in": "path",
-            "description": "The path of the target directory.",
-            "required": true,
-            "type": "string",
-            "x-ms-parameter-location": "method",
-            "x-ms-skip-url-encoding": false
-        },
         "FileCacheControl": {
             "name": "x-ms-cache-control",
             "x-ms-client-name": "fileCacheControl",
@@ -3621,15 +3441,6 @@
                 "name": "file-HTTP-headers"
             }
         },
-        "FilePath": {
-            "name": "filePath",
-            "in": "path",
-            "description": "The path of the target file.",
-            "required": true,
-            "type": "string",
-            "x-ms-parameter-location": "method",
-            "x-ms-skip-url-encoding": false
-        },
         "FileType": {
             "name": "x-ms-type",
             "x-ms-client-name": "fileTypeConstant",
@@ -3761,14 +3572,6 @@
             },
             "x-ms-parameter-location": "method"
         },
-        "ShareName": {
-            "name": "shareName",
-            "in": "path",
-            "description": "The name of the target share.",
-            "required": true,
-            "type": "string",
-            "x-ms-parameter-location": "method"
-        },
         "ShareQuota": {
             "name": "x-ms-share-quota",
             "x-ms-client-name": "quota",
@@ -3787,13 +3590,13 @@
             "type": "string",
             "x-ms-parameter-location": "method"
         },
-        "FileServiceProperties": {
-            "name": "FileServiceProperties",
+        "StorageServiceProperties": {
+            "name": "StorageServiceProperties",
             "in": "body",
-            "description": "The FileStorage properties.",
+            "description": "The StorageService properties.",
             "required": true,
             "schema": {
-                "$ref": "#/definitions/FileServiceProperties"
+                "$ref": "#/definitions/StorageServiceProperties"
             },
             "x-ms-parameter-location": "method"
         },
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
index bf79a8453997..d38e8c043629 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageBuilder.java
@@ -67,6 +67,9 @@ public AzureQueueStorageBuilder pipeline(HttpPipeline pipeline) {
      * @return an instance of AzureQueueStorageImpl.
      */
     public AzureQueueStorageImpl build() {
+        if (version == null) {
+            this.version = "2018-03-28";
+        }
         if (pipeline == null) {
             this.pipeline = RestProxy.createDefaultPipeline();
         }
@@ -76,8 +79,6 @@ public AzureQueueStorageImpl build() {
         }
         if (this.version != null) {
             client.setVersion(this.version);
-        } else {
-            client.setVersion("2018-03-28");
         }
         return client;
     }
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java
index 1ee2de77a19a..29b4b3a947e7 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/implementation/AzureQueueStorageImpl.java
@@ -29,9 +29,11 @@ public String getUrl() {
      * Sets The URL of the service account, queue or message that is the targe of the desired operation.
      *
      * @param url the url value.
+     * @return the service client itself.
      */
-    void setUrl(String url) {
+    AzureQueueStorageImpl setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     /**
@@ -52,9 +54,11 @@ public String getVersion() {
      * Sets Specifies the version of the operation to use for this request.
      *
      * @param version the version value.
+     * @return the service client itself.
      */
-    void setVersion(String version) {
+    AzureQueueStorageImpl setVersion(String version) {
         this.version = version;
+        return this;
     }
 
     /**
diff --git a/sdk/storage/azure-storage-queue/swagger/README.md b/sdk/storage/azure-storage-queue/swagger/README.md
new file mode 100644
index 000000000000..c3d45d9acacc
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/swagger/README.md
@@ -0,0 +1,175 @@
+# Azure Queue Storage for Java
+
+> see https://aka.ms/autorest
+
+### Setup
+```ps
+cd C:\work
+git clone --recursive https://github.com/Azure/autorest.java/
+cd autorest.java
+git checkout v3
+npm install
+cd ..
+git clone --recursive https://github.com/jianghaolu/autorest.modeler/
+cd autorest.modeler
+git checkout headerprefixfix
+npm install
+```
+
+### Generation
+```ps
+cd <swagger-folder>
+autorest --use=C:/work/autorest.java --use=C:/work/autorest.modeler --version=2.0.4280
+```
+
+### Code generation settings
+``` yaml
+input-file: ./queue-2018-03-28.json
+java: true
+output-folder: ../
+namespace: com.azure.storage.queue
+enable-xml: true
+generate-client-interfaces: false
+sync-methods: none
+license-header: MICROSOFT_MIT_SMALL
+add-context-parameter: true
+```
+
+### /{queueName}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}?comp=metadata
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}?comp=metadata"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}?comp=acl
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}?comp=acl"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.put.parameters.splice(0, 0, { "$ref": path });
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+        $.delete.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}"]
+  transform: >
+    let param = $.post.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.post.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages?peekonly=true
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages?peekonly=true"]
+  transform: >
+    let param = $.get.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const path = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        $.get.parameters.splice(0, 0, { "$ref": path });
+    }
+```
+
+### /{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const queueNamePath = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        const messageIdPath = param["$ref"].replace(/[#].*$/, "#/parameters/MessageId");
+        $.put.parameters.splice(0, 0, { "$ref": queueNamePath });
+        $.put.parameters.splice(1, 0, { "$ref": messageIdPath });
+    }
+```
+
+### /{queueName}/messages/{messageid}?popreceipt={popReceipt}
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{queueName}/messages/{messageid}?popreceipt={popReceipt}"]
+  transform: >
+    let param = $.delete.parameters[0];
+    if (!param["$ref"].endsWith("QueueName")) {
+        const queueNamePath = param["$ref"].replace(/[#].*$/, "#/parameters/QueueName");
+        const messageIdPath = param["$ref"].replace(/[#].*$/, "#/parameters/MessageId");
+        $.delete.parameters.splice(0, 0, { "$ref": queueNamePath });
+        $.delete.parameters.splice(1, 0, { "$ref": messageIdPath });
+    }
+```
+
+### Rename MessageItems
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions
+  transform: >
+    if (!$.DequeuedMessage) {
+        $.DequeuedMessage = $.DequeuedMessageItem;
+        delete $.DequeuedMessageItem;
+        $.DequeuedMessagesList.items.$ref = $.DequeuedMessagesList.items.$ref.replace("DequeuedMessageItem", "DequeuedMessage");
+    }
+    if (!$.PeekedMessage) {
+        $.PeekedMessage = $.PeekedMessageItem;
+        delete $.PeekedMessageItem;
+        $.PeekedMessagesList.items.$ref = $.PeekedMessagesList.items.$ref.replace("PeekedMessageItem", "PeekedMessage");
+    }
+```
+
+### MessageId
+``` yaml
+directive:
+- from: swagger-document
+  where: $.parameters.MessageId
+  transform: >
+    $.description = "The message ID name.";
+```
diff --git a/sdk/storage/azure-storage-queue/swagger/queue-2018-03-28.json b/sdk/storage/azure-storage-queue/swagger/queue-2018-03-28.json
new file mode 100644
index 000000000000..49ca3244ed16
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/swagger/queue-2018-03-28.json
@@ -0,0 +1,1856 @@
+{
+    "swagger": "2.0",
+    "info": {
+      "title": "Azure Queue Storage",
+      "version": "2018-03-28",
+      "x-ms-code-generation-settings": {
+        "header": "MIT",
+        "strictSpecAdherence": false
+      }
+    },
+    "x-ms-parameterized-host": {
+      "hostTemplate": "{url}",
+      "useSchemePrefix": false,
+      "positionInOperation": "first",
+      "parameters": [
+        {
+          "$ref": "#/parameters/Url"
+        }
+      ]
+    },
+    "securityDefinitions": {
+      "queue_shared_key": {
+        "type": "apiKey",
+        "name": "Authorization",
+        "in": "header"
+      }
+    },
+    "schemes": [
+      "https"
+    ],
+    "consumes": [
+      "application/xml"
+    ],
+    "produces": [
+      "application/xml"
+    ],
+    "paths": {},
+    "x-ms-paths": {
+      "/?restype=service&comp=properties": {
+        "put": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_SetProperties",
+          "description": "Sets properties for a storage account's Queue service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
+          "parameters": [
+            {
+              "$ref": "#/parameters/StorageServiceProperties"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "202": {
+              "description": "Success (Accepted)",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetProperties",
+          "description": "gets the properties of a storage account's Queue service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceProperties"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "properties"
+            ]
+          }
+        ]
+      },
+      "/?restype=service&comp=stats": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_GetStatistics",
+          "description": "Retrieves statistics related to replication for the Queue service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageServiceStats"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "restype",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "service"
+            ]
+          },
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "stats"
+            ]
+          }
+        ]
+      },
+      "/?comp=list": {
+        "get": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Service_ListQueuesSegment",
+          "description": "The List Queues Segment operation returns a list of the queues under the specified account",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Prefix"
+            },
+            {
+              "$ref": "#/parameters/Marker"
+            },
+            {
+              "$ref": "#/parameters/MaxResults"
+            },
+            {
+              "$ref": "#/parameters/ListQueuesInclude"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/ListQueuesSegmentResponse"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          },
+          "x-ms-pageable": {
+            "nextLinkName": "NextMarker"
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "list"
+            ]
+          }
+        ]
+      },
+      "/{queueName}": {
+        "put": {
+          "tags": [
+            "service"
+          ],
+          "operationId": "Queue_Create",
+          "description": "creates a new queue under the given account.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "Success, queue created.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "204": {
+              "description": "Success, queue created.",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_Delete",
+          "description": "operation permanently deletes the specified queue",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}?comp=metadata": {
+        "get": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_GetProperties",
+          "description": "Retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated with the queue as name-values pairs.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success.",
+              "headers": {
+                "x-ms-meta": {
+                  "type": "string",
+                  "x-ms-client-name": "Metadata",
+                  "x-ms-header-collection-prefix": "x-ms-meta-"
+                },
+                "x-ms-approximate-messages-count": {
+                  "type": "integer",
+                  "x-ms-client-name": "ApproximateMessagesCount",
+                  "description": "The approximate number of messages in the queue. This number is not lower than the actual number of messages in the queue, but could be higher."
+                },
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "put": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_SetMetadata",
+          "description": "sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/Metadata"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "metadata"
+            ]
+          }
+        ]
+      },
+      "/{queueName}?comp=acl": {
+        "get": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_GetAccessPolicy",
+          "description": "returns details about any stored access policies specified on the queue that may be used with Shared Access Signatures.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Success",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/SignedIdentifiers"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "put": {
+          "tags": [
+            "queue"
+          ],
+          "operationId": "Queue_SetAccessPolicy",
+          "description": "sets stored access policies for the queue that may be used with Shared Access Signatures",
+          "parameters": [
+            {
+              "$ref": "#/parameters/QueueAcl"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "comp",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "acl"
+            ]
+          }
+        ]
+      },
+      "/{queueName}/messages": {
+        "get": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Dequeue",
+          "description": "The Dequeue operation retrieves one or more messages from the front of the queue.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/NumOfMessages"
+            },
+            {
+              "$ref": "#/parameters/VisibilityTimeout"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "OK",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/DequeuedMessagesList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "delete": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Clear",
+          "description": "The Clear operation deletes all messages from the specified queue.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}": {
+        "post": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Enqueue",
+          "description": "The Enqueue operation adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request with UTF-8 encoding. The encoded message can be up to 64 KB in size for versions 2011-08-18 and newer, or 8 KB in size for previous versions.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/QueueMessage"
+            },
+            {
+              "$ref": "#/parameters/VisibilityTimeout"
+            },
+            {
+              "$ref": "#/parameters/MessageTTL"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "Created",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/EnqueuedMessageList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}/messages?peekonly=true": {
+        "get": {
+          "tags": [
+            "message"
+          ],
+          "operationId": "Messages_Peek",
+          "description": "The Peek operation retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/NumOfMessages"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "OK",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/PeekedMessagesList"
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "peekonly",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "true"
+            ]
+          }
+        ]
+      },
+      "/{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}": {
+        "put": {
+          "tags": [
+            "messageId"
+          ],
+          "operationId": "MessageId_Update",
+          "description": "The Update operation was introduced with version 2011-08-18 of the Queue service API. The Update Message operation updates the visibility timeout of a message. You can also use this operation to update the contents of a message. A message must be in a format that can be included in an XML request with UTF-8 encoding, and the encoded message can be up to 64KB in size.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/QueueMessage"
+            },
+            {
+              "$ref": "#/parameters/PopReceipt"
+            },
+            {
+              "$ref": "#/parameters/VisibilityTimeoutRequired"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                },
+                "x-ms-popreceipt": {
+                  "x-ms-client-name": "PopReceipt",
+                  "type": "string",
+                  "description": "The pop receipt of the queue message."
+                },
+                "x-ms-time-next-visible": {
+                  "x-ms-client-name": "TimeNextVisible",
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "A UTC date/time value that represents when the message will be visible on the queue."
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      },
+      "/{queueName}/messages/{messageid}?popreceipt={popReceipt}": {
+        "delete": {
+          "tags": [
+            "messageId"
+          ],
+          "operationId": "MessageId_Delete",
+          "description": "The Delete operation deletes the specified message.",
+          "parameters": [
+            {
+              "$ref": "#/parameters/PopReceipt"
+            },
+            {
+              "$ref": "#/parameters/Timeout"
+            },
+            {
+              "$ref": "#/parameters/ApiVersionParameter"
+            },
+            {
+              "$ref": "#/parameters/ClientRequestId"
+            }
+          ],
+          "responses": {
+            "204": {
+              "description": "No Content",
+              "headers": {
+                "x-ms-request-id": {
+                  "x-ms-client-name": "RequestId",
+                  "type": "string",
+                  "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
+                },
+                "x-ms-version": {
+                  "x-ms-client-name": "Version",
+                  "type": "string",
+                  "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
+                },
+                "Date": {
+                  "type": "string",
+                  "format": "date-time-rfc1123",
+                  "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
+                }
+              }
+            },
+            "default": {
+              "description": "Failure",
+              "headers": {
+                "x-ms-error-code": {
+                  "x-ms-client-name": "ErrorCode",
+                  "type": "string"
+                }
+              },
+              "schema": {
+                "$ref": "#/definitions/StorageError"
+              }
+            }
+          }
+        },
+        "parameters": []
+      }
+    },
+    "definitions": {
+      "AccessPolicy": {
+        "type": "object",
+        "required": [
+          "Start",
+          "Expiry",
+          "Permission"
+        ],
+        "description": "An Access policy",
+        "properties": {
+          "Start": {
+            "description": "the date-time the policy is active",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Expiry": {
+            "description": "the date-time the policy expires",
+            "type": "string",
+            "format": "date-time"
+          },
+          "Permission": {
+            "description": "the permissions for the acl policy",
+            "type": "string"
+          }
+        }
+      },
+      "ListQueuesSegmentResponse": {
+        "xml": {
+          "name": "EnumerationResults"
+        },
+        "description": "The object returned when calling List Queues on a Queue Service.",
+        "type": "object",
+        "required": [
+          "ServiceEndpoint",
+          "Prefix",
+          "MaxResults",
+          "NextMarker"
+        ],
+        "properties": {
+          "ServiceEndpoint": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "Prefix": {
+            "type": "string"
+          },
+          "Marker": {
+            "type": "string"
+          },
+          "MaxResults": {
+            "type": "integer"
+          },
+          "QueueItems": {
+            "xml": {
+              "wrapped": true,
+              "name": "Queues"
+            },
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/QueueItem"
+            }
+          },
+          "NextMarker": {
+            "type": "string"
+          }
+        }
+      },
+      "CorsRule": {
+        "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
+        "type": "object",
+        "required": [
+          "AllowedOrigins",
+          "AllowedMethods",
+          "AllowedHeaders",
+          "ExposedHeaders",
+          "MaxAgeInSeconds"
+        ],
+        "properties": {
+          "AllowedOrigins": {
+            "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
+            "type": "string"
+          },
+          "AllowedMethods": {
+            "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
+            "type": "string"
+          },
+          "AllowedHeaders": {
+            "description": "the request headers that the origin domain may specify on the CORS request.",
+            "type": "string"
+          },
+          "ExposedHeaders": {
+            "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
+            "type": "string"
+          },
+          "MaxAgeInSeconds": {
+            "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+            "type": "integer",
+            "minimum": 0
+          }
+        }
+      },
+      "ErrorCode": {
+        "description": "Error codes returned by the service",
+        "type": "string",
+        "enum": [
+          "AccountAlreadyExists",
+          "AccountBeingCreated",
+          "AccountIsDisabled",
+          "AuthenticationFailed",
+          "AuthorizationFailure",
+          "ConditionHeadersNotSupported",
+          "ConditionNotMet",
+          "EmptyMetadataKey",
+          "InsufficientAccountPermissions",
+          "InternalError",
+          "InvalidAuthenticationInfo",
+          "InvalidHeaderValue",
+          "InvalidHttpVerb",
+          "InvalidInput",
+          "InvalidMd5",
+          "InvalidMetadata",
+          "InvalidQueryParameterValue",
+          "InvalidRange",
+          "InvalidResourceName",
+          "InvalidUri",
+          "InvalidXmlDocument",
+          "InvalidXmlNodeValue",
+          "Md5Mismatch",
+          "MetadataTooLarge",
+          "MissingContentLengthHeader",
+          "MissingRequiredQueryParameter",
+          "MissingRequiredHeader",
+          "MissingRequiredXmlNode",
+          "MultipleConditionHeadersNotSupported",
+          "OperationTimedOut",
+          "OutOfRangeInput",
+          "OutOfRangeQueryParameterValue",
+          "RequestBodyTooLarge",
+          "ResourceTypeMismatch",
+          "RequestUrlFailedToParse",
+          "ResourceAlreadyExists",
+          "ResourceNotFound",
+          "ServerBusy",
+          "UnsupportedHeader",
+          "UnsupportedXmlNode",
+          "UnsupportedQueryParameter",
+          "UnsupportedHttpVerb",
+          "InvalidMarker",
+          "MessageNotFound",
+          "MessageTooLarge",
+          "PopReceiptMismatch",
+          "QueueAlreadyExists",
+          "QueueBeingDeleted",
+          "QueueDisabled",
+          "QueueNotEmpty",
+          "QueueNotFound"
+        ],
+        "x-ms-enum": {
+          "name": "StorageErrorCode",
+          "modelAsString": true
+        }
+      },
+      "GeoReplication": {
+        "type": "object",
+        "required": [
+          "Status",
+          "LastSyncTime"
+        ],
+        "properties": {
+          "Status": {
+            "description": "The status of the secondary location",
+            "type": "string",
+            "enum": [
+              "live",
+              "bootstrap",
+              "unavailable"
+            ],
+            "x-ms-enum": {
+              "name": "GeoReplicationStatusType",
+              "modelAsString": true
+            }
+          },
+          "LastSyncTime": {
+            "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
+            "type": "string",
+            "format": "date-time-rfc1123"
+          }
+        }
+      },
+      "Logging": {
+        "description": "Azure Analytics Logging settings.",
+        "type": "object",
+        "required": [
+          "Version",
+          "Delete",
+          "Read",
+          "Write",
+          "RetentionPolicy"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Delete": {
+            "description": "Indicates whether all delete requests should be logged.",
+            "type": "boolean"
+          },
+          "Read": {
+            "description": "Indicates whether all read requests should be logged.",
+            "type": "boolean"
+          },
+          "Write": {
+            "description": "Indicates whether all write requests should be logged.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "Metadata": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "string"
+        }
+      },
+      "StorageError": {
+        "type": "object",
+        "properties": {
+          "Message": {
+            "type": "string"
+          }
+        }
+      },
+      "Metrics": {
+        "description": "",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Version": {
+            "description": "The version of Storage Analytics to configure.",
+            "type": "string"
+          },
+          "Enabled": {
+            "description": "Indicates whether metrics are enabled for the Queue service.",
+            "type": "boolean"
+          },
+          "IncludeAPIs": {
+            "description": "Indicates whether metrics should generate summary statistics for called API operations.",
+            "type": "boolean"
+          },
+          "RetentionPolicy": {
+            "$ref": "#/definitions/RetentionPolicy"
+          }
+        }
+      },
+      "QueueItem": {
+        "description": "An Azure Storage Queue.",
+        "type": "object",
+        "required": [
+          "Name"
+        ],
+        "properties": {
+          "Name": {
+            "type": "string",
+            "description": "The name of the Queue."
+          },
+          "Metadata": {
+            "$ref": "#/definitions/Metadata"
+          }
+        },
+        "xml": {
+          "name": "Queue"
+        }
+      },
+      "QueueMessage": {
+        "description": "A Message object which can be stored in a Queue",
+        "type": "object",
+        "required": [
+          "MessageText"
+        ],
+        "properties": {
+          "MessageText": {
+            "type": "string",
+            "description": "The content of the message"
+          }
+        }
+      },
+      "DequeuedMessageItem": {
+        "description": "The object returned in the QueueMessageList array when calling Get Messages on a Queue.",
+        "type": "object",
+        "required": [
+          "MessageId",
+          "InsertionTime",
+          "ExpirationTime",
+          "PopReceipt",
+          "TimeNextVisible",
+          "DequeueCount",
+          "MessageText"
+        ],
+        "properties": {
+          "MessageId": {
+            "type": "string",
+            "description": "The Id of the Message."
+          },
+          "InsertionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time the Message was inserted into the Queue."
+          },
+          "ExpirationTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the Message will expire and be automatically deleted."
+          },
+          "PopReceipt": {
+            "type": "string",
+            "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
+          },
+          "TimeNextVisible": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the message will again become visible in the Queue."
+          },
+          "DequeueCount": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of times the message has been dequeued."
+          },
+          "MessageText": {
+            "type": "string",
+            "description": "The content of the Message."
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessage"
+        }
+      },
+      "PeekedMessageItem": {
+        "description": "The object returned in the QueueMessageList array when calling Peek Messages on a Queue",
+        "type": "object",
+        "required": [
+          "MessageId",
+          "InsertionTime",
+          "ExpirationTime",
+          "DequeueCount",
+          "MessageText"
+        ],
+        "properties": {
+          "MessageId": {
+            "type": "string",
+            "description": "The Id of the Message."
+          },
+          "InsertionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time the Message was inserted into the Queue."
+          },
+          "ExpirationTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the Message will expire and be automatically deleted."
+          },
+          "DequeueCount": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of times the message has been dequeued."
+          },
+          "MessageText": {
+            "type": "string",
+            "description": "The content of the Message."
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessage"
+        }
+      },
+      "EnqueuedMessage": {
+        "description": "The object returned in the QueueMessageList array when calling Put Message on a Queue",
+        "type": "object",
+        "required": [
+          "MessageId",
+          "InsertionTime",
+          "ExpirationTime",
+          "PopReceipt",
+          "TimeNextVisible"
+        ],
+        "properties": {
+          "MessageId": {
+            "type": "string",
+            "description": "The Id of the Message."
+          },
+          "InsertionTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time the Message was inserted into the Queue."
+          },
+          "ExpirationTime": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the Message will expire and be automatically deleted."
+          },
+          "PopReceipt": {
+            "type": "string",
+            "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
+          },
+          "TimeNextVisible": {
+            "type": "string",
+            "format": "date-time-rfc1123",
+            "description": "The time that the message will again become visible in the Queue."
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessage"
+        }
+      },
+      "DequeuedMessagesList": {
+        "description": "The object returned when calling Get Messages on a Queue",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/DequeuedMessageItem",
+          "xml": {
+            "name": "QueueMessage"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessagesList"
+        }
+      },
+      "PeekedMessagesList": {
+        "description": "The object returned when calling Peek Messages on a Queue",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/PeekedMessageItem",
+          "xml": {
+            "name": "QueueMessage"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessagesList"
+        }
+      },
+      "EnqueuedMessageList": {
+        "description": "The object returned when calling Put Message on a Queue",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/EnqueuedMessage",
+          "xml": {
+            "name": "QueueMessage"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "QueueMessagesList"
+        }
+      },
+      "RetentionPolicy": {
+        "description": "the retention policy",
+        "type": "object",
+        "required": [
+          "Enabled"
+        ],
+        "properties": {
+          "Enabled": {
+            "description": "Indicates whether a retention policy is enabled for the storage service",
+            "type": "boolean"
+          },
+          "Days": {
+            "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
+            "type": "integer",
+            "minimum": 1
+          }
+        }
+      },
+      "SignedIdentifier": {
+        "description": "signed identifier",
+        "type": "object",
+        "required": [
+          "Id",
+          "AccessPolicy"
+        ],
+        "properties": {
+          "Id": {
+            "type": "string",
+            "description": "a unique id"
+          },
+          "AccessPolicy": {
+            "description": "The access policy",
+            "$ref": "#/definitions/AccessPolicy"
+          }
+        }
+      },
+      "SignedIdentifiers": {
+        "description": "a collection of signed identifiers",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/SignedIdentifier",
+          "xml": {
+            "name": "SignedIdentifier"
+          }
+        },
+        "xml": {
+          "wrapped": true,
+          "name": "SignedIdentifiers"
+        }
+      },
+      "StorageServiceProperties": {
+        "description": "Storage Service Properties.",
+        "type": "object",
+        "properties": {
+          "Logging": {
+            "description": "Azure Analytics Logging settings",
+            "$ref": "#/definitions/Logging"
+          },
+          "HourMetrics": {
+            "description": "A summary of request statistics grouped by API in hourly aggregates for queues",
+            "$ref": "#/definitions/Metrics"
+          },
+          "MinuteMetrics": {
+            "description": "a summary of request statistics grouped by API in minute aggregates for queues",
+            "$ref": "#/definitions/Metrics"
+          },
+          "Cors": {
+            "description": "The set of CORS rules.",
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/CorsRule",
+              "xml": {
+                "name": "CorsRule"
+              }
+            },
+            "xml": {
+              "wrapped": true
+            }
+          }
+        }
+      },
+      "StorageServiceStats": {
+        "description": "Stats for the storage service.",
+        "type": "object",
+        "properties": {
+          "GeoReplication": {
+            "description": "Geo-Replication information for the Secondary Storage Service",
+            "$ref": "#/definitions/GeoReplication"
+          }
+        }
+      }
+    },
+    "parameters": {
+      "Url": {
+        "name": "url",
+        "description": "The URL of the service account, queue or message that is the targe of the desired operation.",
+        "required": true,
+        "type": "string",
+        "in": "path",
+        "x-ms-skip-url-encoding": true
+      },
+      "ApiVersionParameter": {
+        "name": "x-ms-version",
+        "x-ms-client-name": "version",
+        "in": "header",
+        "required": true,
+        "type": "string",
+        "description": "Specifies the version of the operation to use for this request.",
+        "enum": [
+          "2018-03-28"
+        ]
+      },
+      "Body": {
+        "name": "body",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "type": "object",
+          "format": "file"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Initial data"
+      },
+      "QueueAcl": {
+        "name": "queueAcl",
+        "in": "body",
+        "schema": {
+          "$ref": "#/definitions/SignedIdentifiers"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "the acls for the queue"
+      },
+      "ClientRequestId": {
+        "name": "x-ms-client-request-id",
+        "x-ms-client-name": "requestId",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled."
+      },
+      "ContentLength": {
+        "name": "Content-Length",
+        "in": "header",
+        "required": true,
+        "type": "integer",
+        "format": "int64",
+        "x-ms-parameter-location": "method",
+        "description": "The length of the request."
+      },
+      "ListQueuesInclude": {
+        "name": "include", 
+        "in": "query", 
+        "required": false, 
+        "type": "array",
+        "collectionFormat": "csv",
+        "items": {
+        "type": "string", 
+        "enum": [ 
+          "metadata" 
+        ], 
+        "x-ms-enum": { 
+          "name": "ListQueuesIncludeType", 
+          "modelAsString": false 
+          }
+        },
+        "x-ms-parameter-location": "method",
+        "description": "Include this parameter to specify that the queues's metadata be returned as part of the response body."
+      },
+      "Marker": {
+        "name": "marker",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "A string value that identifies the portion of the list of queues to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all queues remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
+        "x-ms-parameter-location": "method"
+      },
+      "MaxResults": {
+        "name": "maxresults",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 1,
+        "x-ms-parameter-location": "method",
+        "description": "Specifies the maximum number of queues to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
+      },
+      "MessageId": {
+        "name": "messageid",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The container name."
+      },
+      "MessageTTL": {
+        "name": "messagettl",
+        "x-ms-client-name": "MessageTimeToLive",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": -1,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies the time-to-live interval for the message, in seconds. Prior to version 2017-07-29, the maximum time-to-live allowed is 7 days. For version 2017-07-29 or later, the maximum time-to-live can be any positive number, as well as -1 indicating that the message does not expire. If this parameter is omitted, the default time-to-live is 7 days."
+      },
+      "Metadata": {
+        "name": "x-ms-meta",
+        "x-ms-client-name": "metadata",
+        "in": "header",
+        "required": false,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Include this parameter to specify that the queue's metadata be returned as part of the response body. Note that metadata requested with this parameter must be stored in accordance with the naming restrictions imposed by the 2009-09-19 version of the Queue service. Beginning with this version, all metadata names must adhere to the naming conventions for C# identifiers.",
+        "x-ms-header-collection-prefix": "x-ms-meta-"
+      },
+      "NumOfMessages": {
+        "name": "numofmessages",
+        "x-ms-client-name": "numberOfMessages",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 1,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation."
+      },
+      "PopReceipt": {
+        "name": "popreceipt",
+        "x-ms-client-name": "popReceipt",
+        "in": "query",
+        "required": true,
+        "x-ms-parameter-location": "method",
+        "description": "Required. Specifies the valid pop receipt value returned from an earlier call to the Get Messages or Update Message operation.",
+        "type": "string"
+      },
+      "Prefix": {
+        "name": "prefix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "Filters the results to return only queues whose name begins with the specified prefix.",
+        "x-ms-parameter-location": "method"
+      },
+      "QueueMessage": {
+        "name": "QueueMessage",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/QueueMessage"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "A Message object which can be stored in a Queue"
+      },
+      "QueueName": {
+        "name": "queueName",
+        "in": "path",
+        "required": true,
+        "type": "string",
+        "x-ms-parameter-location": "method",
+        "description": "The queue name."
+      },
+      "StorageServiceProperties": {
+        "name": "StorageServiceProperties",
+        "in": "body",
+        "required": true,
+        "schema": {
+          "$ref": "#/definitions/StorageServiceProperties"
+        },
+        "x-ms-parameter-location": "method",
+        "description": "The StorageService properties."
+      },
+      "Timeout": {
+        "name": "timeout",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 0,
+        "x-ms-parameter-location": "method",
+        "description": "The The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/setting-timeouts-for-queue-service-operations>Setting Timeouts for Queue Service Operations.</a>"
+      },
+      "VisibilityTimeout": {
+        "name": "visibilitytimeout",
+        "in": "query",
+        "required": false,
+        "type": "integer",
+        "minimum": 0,
+        "maximum": 604800,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
+      },
+      "VisibilityTimeoutRequired": {
+        "name": "visibilitytimeout",
+        "in": "query",
+        "required": true,
+        "type": "integer",
+        "minimum": 0,
+        "maximum": 604800,
+        "x-ms-parameter-location": "method",
+        "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
+      }
+    }
+  }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/swagger/queue.json b/sdk/storage/azure-storage-queue/swagger/queue.json
deleted file mode 100644
index 977d767b9f84..000000000000
--- a/sdk/storage/azure-storage-queue/swagger/queue.json
+++ /dev/null
@@ -1,1898 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Azure Queue Storage",
-    "version": "2018-03-28",
-    "x-ms-code-generation-settings": {
-      "header": "MIT",
-      "strictSpecAdherence": false
-    }
-  },
-  "x-ms-parameterized-host": {
-    "hostTemplate": "{url}",
-    "useSchemePrefix": false,
-    "positionInOperation": "first",
-    "parameters": [
-      {
-        "$ref": "#/parameters/Url"
-      }
-    ]
-  },
-  "securityDefinitions": {
-    "queue_shared_key": {
-      "type": "apiKey",
-      "name": "Authorization",
-      "in": "header"
-    }
-  },
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/xml"
-  ],
-  "produces": [
-    "application/xml"
-  ],
-  "paths": {},
-  "x-ms-paths": {
-    "/?restype=service&comp=properties": {
-      "put": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_SetProperties",
-        "description": "Sets properties for a storage account's Queue service endpoint, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules",
-        "parameters": [
-          {
-            "$ref": "#/parameters/StorageServiceProperties"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "202": {
-            "description": "Success (Accepted)",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetProperties",
-        "description": "gets the properties of a storage account's Queue service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceProperties"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "properties"
-          ]
-        }
-      ]
-    },
-    "/?restype=service&comp=stats": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_GetStatistics",
-        "description": "Retrieves statistics related to replication for the Queue service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageServiceStats"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "restype",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "service"
-          ]
-        },
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "stats"
-          ]
-        }
-      ]
-    },
-    "/?comp=list": {
-      "get": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Service_ListQueuesSegment",
-        "description": "The List Queues Segment operation returns a list of the queues under the specified account",
-        "parameters": [
-          {
-            "$ref": "#/parameters/Prefix"
-          },
-          {
-            "$ref": "#/parameters/Marker"
-          },
-          {
-            "$ref": "#/parameters/MaxResults"
-          },
-          {
-            "$ref": "#/parameters/ListQueuesInclude"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ListQueuesSegmentResponse"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "NextMarker"
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "list"
-          ]
-        }
-      ]
-    },
-    "/{queueName}": {
-      "put": {
-        "tags": [
-          "service"
-        ],
-        "operationId": "Queue_Create",
-        "description": "creates a new queue under the given account.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Success, queue created.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "204": {
-            "description": "Success, queue created.",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_Delete",
-        "description": "operation permanently deletes the specified queue",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}?comp=metadata": {
-      "get": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_GetProperties",
-        "description": "Retrieves user-defined metadata and queue properties on the specified queue. Metadata is associated with the queue as name-values pairs.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success.",
-            "headers": {
-              "x-ms-meta": {
-                "type": "string",
-                "x-ms-client-name": "Metadata",
-                "x-ms-header-collection-prefix": "x-ms-meta-"
-              },
-              "x-ms-approximate-messages-count": {
-                "type": "integer",
-                "x-ms-client-name": "ApproximateMessagesCount",
-                "description": "The approximate number of messages in the queue. This number is not lower than the actual number of messages in the queue, but could be higher."
-              },
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_SetMetadata",
-        "description": "sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/Metadata"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "metadata"
-          ]
-        }
-      ]
-    },
-    "/{queueName}?comp=acl": {
-      "get": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_GetAccessPolicy",
-        "description": "returns details about any stored access policies specified on the queue that may be used with Shared Access Signatures.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/SignedIdentifiers"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "queue"
-        ],
-        "operationId": "Queue_SetAccessPolicy",
-        "description": "sets stored access policies for the queue that may be used with Shared Access Signatures",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/QueueAcl"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "comp",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "acl"
-          ]
-        }
-      ]
-    },
-    "/{queueName}/messages": {
-      "get": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Dequeue",
-        "description": "The Dequeue operation retrieves one or more messages from the front of the queue.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/NumOfMessages"
-          },
-          {
-            "$ref": "#/parameters/VisibilityTimeout"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/DequeuedMessagesList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Clear",
-        "description": "The Clear operation deletes all messages from the specified queue.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}/messages?visibilitytimeout={visibilityTimeout}&messagettl={messageTimeToLive}": {
-      "post": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Enqueue",
-        "description": "The Enqueue operation adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request with UTF-8 encoding. The encoded message can be up to 64 KB in size for versions 2011-08-18 and newer, or 8 KB in size for previous versions.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/QueueMessage"
-          },
-          {
-            "$ref": "#/parameters/VisibilityTimeout"
-          },
-          {
-            "$ref": "#/parameters/MessageTTL"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Created",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/EnqueuedMessageList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}/messages?peekonly=true": {
-      "get": {
-        "tags": [
-          "message"
-        ],
-        "operationId": "Messages_Peek",
-        "description": "The Peek operation retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/NumOfMessages"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/PeekedMessagesList"
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "peekonly",
-          "in": "query",
-          "required": true,
-          "type": "string",
-          "enum": [
-            "true"
-          ]
-        }
-      ]
-    },
-    "/{queueName}/messages/{messageid}?popreceipt={popReceipt}&visibilitytimeout={visibilityTimeout}": {
-      "put": {
-        "tags": [
-          "messageId"
-        ],
-        "operationId": "MessageId_Update",
-        "description": "The Update operation was introduced with version 2011-08-18 of the Queue service API. The Update Message operation updates the visibility timeout of a message. You can also use this operation to update the contents of a message. A message must be in a format that can be included in an XML request with UTF-8 encoding, and the encoded message can be up to 64KB in size.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/MessageId"
-          },
-          {
-            "$ref": "#/parameters/QueueMessage"
-          },
-          {
-            "$ref": "#/parameters/PopReceipt"
-          },
-          {
-            "$ref": "#/parameters/VisibilityTimeoutRequired"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              },
-              "x-ms-popreceipt": {
-                "x-ms-client-name": "PopReceipt",
-                "type": "string",
-                "description": "The pop receipt of the queue message."
-              },
-              "x-ms-time-next-visible": {
-                "x-ms-client-name": "TimeNextVisible",
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "A UTC date/time value that represents when the message will be visible on the queue."
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    },
-    "/{queueName}/messages/{messageid}?popreceipt={popReceipt}": {
-      "delete": {
-        "tags": [
-          "messageId"
-        ],
-        "operationId": "MessageId_Delete",
-        "description": "The Delete operation deletes the specified message.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/QueueName"
-          },
-          {
-            "$ref": "#/parameters/MessageId"
-          },
-          {
-            "$ref": "#/parameters/PopReceipt"
-          },
-          {
-            "$ref": "#/parameters/Timeout"
-          },
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/ClientRequestId"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content",
-            "headers": {
-              "x-ms-request-id": {
-                "x-ms-client-name": "RequestId",
-                "type": "string",
-                "description": "This header uniquely identifies the request that was made and can be used for troubleshooting the request."
-              },
-              "x-ms-version": {
-                "x-ms-client-name": "Version",
-                "type": "string",
-                "description": "Indicates the version of the Queue service used to execute the request. This header is returned for requests made against version 2009-09-19 and above."
-              },
-              "Date": {
-                "type": "string",
-                "format": "date-time-rfc1123",
-                "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-              }
-            }
-          },
-          "default": {
-            "description": "Failure",
-            "headers": {
-              "x-ms-error-code": {
-                "x-ms-client-name": "ErrorCode",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/StorageError"
-            }
-          }
-        }
-      },
-      "parameters": []
-    }
-  },
-  "definitions": {
-    "AccessPolicy": {
-      "type": "object",
-      "required": [
-        "Start",
-        "Expiry",
-        "Permission"
-      ],
-      "description": "An Access policy",
-      "properties": {
-        "Start": {
-          "description": "the date-time the policy is active",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Expiry": {
-          "description": "the date-time the policy expires",
-          "type": "string",
-          "format": "date-time"
-        },
-        "Permission": {
-          "description": "the permissions for the acl policy",
-          "type": "string"
-        }
-      }
-    },
-    "ListQueuesSegmentResponse": {
-      "xml": {
-        "name": "EnumerationResults"
-      },
-      "description": "The object returned when calling List Queues on a Queue Service.",
-      "type": "object",
-      "required": [
-        "ServiceEndpoint",
-        "Prefix",
-        "MaxResults",
-        "NextMarker"
-      ],
-      "properties": {
-        "ServiceEndpoint": {
-          "type": "string",
-          "xml": {
-            "attribute": true
-          }
-        },
-        "Prefix": {
-          "type": "string"
-        },
-        "Marker": {
-          "type": "string"
-        },
-        "MaxResults": {
-          "type": "integer"
-        },
-        "QueueItems": {
-          "xml": {
-            "wrapped": true,
-            "name": "Queues"
-          },
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/QueueItem"
-          }
-        },
-        "NextMarker": {
-          "type": "string"
-        }
-      }
-    },
-    "CorsRule": {
-      "description": "CORS is an HTTP feature that enables a web application running under one domain to access resources in another domain. Web browsers implement a security restriction known as same-origin policy that prevents a web page from calling APIs in a different domain; CORS provides a secure way to allow one domain (the origin domain) to call APIs in another domain",
-      "type": "object",
-      "required": [
-        "AllowedOrigins",
-        "AllowedMethods",
-        "AllowedHeaders",
-        "ExposedHeaders",
-        "MaxAgeInSeconds"
-      ],
-      "properties": {
-        "AllowedOrigins": {
-          "description": "The origin domains that are permitted to make a request against the storage service via CORS. The origin domain is the domain from which the request originates. Note that the origin must be an exact case-sensitive match with the origin that the user age sends to the service. You can also use the wildcard character '*' to allow all origin domains to make requests via CORS.",
-          "type": "string"
-        },
-        "AllowedMethods": {
-          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request. (comma separated)",
-          "type": "string"
-        },
-        "AllowedHeaders": {
-          "description": "the request headers that the origin domain may specify on the CORS request.",
-          "type": "string"
-        },
-        "ExposedHeaders": {
-          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer",
-          "type": "string"
-        },
-        "MaxAgeInSeconds": {
-          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
-          "type": "integer",
-          "minimum": 0
-        }
-      }
-    },
-    "ErrorCode": {
-      "description": "Error codes returned by the service",
-      "type": "string",
-      "enum": [
-        "AccountAlreadyExists",
-        "AccountBeingCreated",
-        "AccountIsDisabled",
-        "AuthenticationFailed",
-        "AuthorizationFailure",
-        "ConditionHeadersNotSupported",
-        "ConditionNotMet",
-        "EmptyMetadataKey",
-        "InsufficientAccountPermissions",
-        "InternalError",
-        "InvalidAuthenticationInfo",
-        "InvalidHeaderValue",
-        "InvalidHttpVerb",
-        "InvalidInput",
-        "InvalidMd5",
-        "InvalidMetadata",
-        "InvalidQueryParameterValue",
-        "InvalidRange",
-        "InvalidResourceName",
-        "InvalidUri",
-        "InvalidXmlDocument",
-        "InvalidXmlNodeValue",
-        "Md5Mismatch",
-        "MetadataTooLarge",
-        "MissingContentLengthHeader",
-        "MissingRequiredQueryParameter",
-        "MissingRequiredHeader",
-        "MissingRequiredXmlNode",
-        "MultipleConditionHeadersNotSupported",
-        "OperationTimedOut",
-        "OutOfRangeInput",
-        "OutOfRangeQueryParameterValue",
-        "RequestBodyTooLarge",
-        "ResourceTypeMismatch",
-        "RequestUrlFailedToParse",
-        "ResourceAlreadyExists",
-        "ResourceNotFound",
-        "ServerBusy",
-        "UnsupportedHeader",
-        "UnsupportedXmlNode",
-        "UnsupportedQueryParameter",
-        "UnsupportedHttpVerb",
-        "InvalidMarker",
-        "MessageNotFound",
-        "MessageTooLarge",
-        "PopReceiptMismatch",
-        "QueueAlreadyExists",
-        "QueueBeingDeleted",
-        "QueueDisabled",
-        "QueueNotEmpty",
-        "QueueNotFound"
-      ],
-      "x-ms-enum": {
-        "name": "StorageErrorCode",
-        "modelAsString": true
-      }
-    },
-    "GeoReplication": {
-      "type": "object",
-      "required": [
-        "Status",
-        "LastSyncTime"
-      ],
-      "properties": {
-        "Status": {
-          "description": "The status of the secondary location",
-          "type": "string",
-          "enum": [
-            "live",
-            "bootstrap",
-            "unavailable"
-          ],
-          "x-ms-enum": {
-            "name": "GeoReplicationStatusType",
-            "modelAsString": true
-          }
-        },
-        "LastSyncTime": {
-          "description": "A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to be available for read operations at the secondary. Primary writes after this point in time may or may not be available for reads.",
-          "type": "string",
-          "format": "date-time-rfc1123"
-        }
-      }
-    },
-    "Logging": {
-      "description": "Azure Analytics Logging settings.",
-      "type": "object",
-      "required": [
-        "Version",
-        "Delete",
-        "Read",
-        "Write",
-        "RetentionPolicy"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Delete": {
-          "description": "Indicates whether all delete requests should be logged.",
-          "type": "boolean"
-        },
-        "Read": {
-          "description": "Indicates whether all read requests should be logged.",
-          "type": "boolean"
-        },
-        "Write": {
-          "description": "Indicates whether all write requests should be logged.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "Metadata": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "StorageError": {
-      "type": "object",
-      "properties": {
-        "Message": {
-          "type": "string"
-        }
-      }
-    },
-    "Metrics": {
-      "description": "",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Version": {
-          "description": "The version of Storage Analytics to configure.",
-          "type": "string"
-        },
-        "Enabled": {
-          "description": "Indicates whether metrics are enabled for the Queue service.",
-          "type": "boolean"
-        },
-        "IncludeAPIs": {
-          "description": "Indicates whether metrics should generate summary statistics for called API operations.",
-          "type": "boolean"
-        },
-        "RetentionPolicy": {
-          "$ref": "#/definitions/RetentionPolicy"
-        }
-      }
-    },
-    "QueueItem": {
-      "description": "An Azure Storage Queue.",
-      "type": "object",
-      "required": [
-        "Name"
-      ],
-      "properties": {
-        "Name": {
-          "type": "string",
-          "description": "The name of the Queue."
-        },
-        "Metadata": {
-          "$ref": "#/definitions/Metadata"
-        }
-      },
-      "xml": {
-        "name": "Queue"
-      }
-    },
-    "QueueMessage": {
-      "description": "A Message object which can be stored in a Queue",
-      "type": "object",
-      "required": [
-        "MessageText"
-      ],
-      "properties": {
-        "MessageText": {
-          "type": "string",
-          "description": "The content of the message"
-        }
-      }
-    },
-    "DequeuedMessage": {
-      "description": "The object returned in the QueueMessageList array when calling Get Messages on a Queue.",
-      "type": "object",
-      "required": [
-        "MessageId",
-        "InsertionTime",
-        "ExpirationTime",
-        "PopReceipt",
-        "TimeNextVisible",
-        "DequeueCount",
-        "MessageText"
-      ],
-      "properties": {
-        "MessageId": {
-          "type": "string",
-          "description": "The Id of the Message."
-        },
-        "InsertionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time the Message was inserted into the Queue."
-        },
-        "ExpirationTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the Message will expire and be automatically deleted."
-        },
-        "PopReceipt": {
-          "type": "string",
-          "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
-        },
-        "TimeNextVisible": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the message will again become visible in the Queue."
-        },
-        "DequeueCount": {
-          "type": "integer",
-          "format": "int64",
-          "description": "The number of times the message has been dequeued."
-        },
-        "MessageText": {
-          "type": "string",
-          "description": "The content of the Message."
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessage"
-      }
-    },
-    "PeekedMessage": {
-      "description": "The object returned in the QueueMessageList array when calling Peek Messages on a Queue",
-      "type": "object",
-      "required": [
-        "MessageId",
-        "InsertionTime",
-        "ExpirationTime",
-        "DequeueCount",
-        "MessageText"
-      ],
-      "properties": {
-        "MessageId": {
-          "type": "string",
-          "description": "The Id of the Message."
-        },
-        "InsertionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time the Message was inserted into the Queue."
-        },
-        "ExpirationTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the Message will expire and be automatically deleted."
-        },
-        "DequeueCount": {
-          "type": "integer",
-          "format": "int64",
-          "description": "The number of times the message has been dequeued."
-        },
-        "MessageText": {
-          "type": "string",
-          "description": "The content of the Message."
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessage"
-      }
-    },
-    "EnqueuedMessage": {
-      "description": "The object returned in the QueueMessageList array when calling Put Message on a Queue",
-      "type": "object",
-      "required": [
-        "MessageId",
-        "InsertionTime",
-        "ExpirationTime",
-        "PopReceipt",
-        "TimeNextVisible"
-      ],
-      "properties": {
-        "MessageId": {
-          "type": "string",
-          "description": "The Id of the Message."
-        },
-        "InsertionTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time the Message was inserted into the Queue."
-        },
-        "ExpirationTime": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the Message will expire and be automatically deleted."
-        },
-        "PopReceipt": {
-          "type": "string",
-          "description": "This value is required to delete the Message. If deletion fails using this popreceipt then the message has been dequeued by another client."
-        },
-        "TimeNextVisible": {
-          "type": "string",
-          "format": "date-time-rfc1123",
-          "description": "The time that the message will again become visible in the Queue."
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessage"
-      }
-    },
-    "DequeuedMessagesList": {
-      "description": "The object returned when calling Get Messages on a Queue",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/DequeuedMessage",
-        "xml": {
-          "name": "QueueMessage"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessagesList"
-      }
-    },
-    "PeekedMessagesList": {
-      "description": "The object returned when calling Peek Messages on a Queue",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/PeekedMessage",
-        "xml": {
-          "name": "QueueMessage"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessagesList"
-      }
-    },
-    "EnqueuedMessageList": {
-      "description": "The object returned when calling Put Message on a Queue",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/EnqueuedMessage",
-        "xml": {
-          "name": "QueueMessage"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "QueueMessagesList"
-      }
-    },
-    "RetentionPolicy": {
-      "description": "the retention policy",
-      "type": "object",
-      "required": [
-        "Enabled"
-      ],
-      "properties": {
-        "Enabled": {
-          "description": "Indicates whether a retention policy is enabled for the storage service",
-          "type": "boolean"
-        },
-        "Days": {
-          "description": "Indicates the number of days that metrics or logging or soft-deleted data should be retained. All data older than this value will be deleted",
-          "type": "integer",
-          "minimum": 1
-        }
-      }
-    },
-    "SignedIdentifier": {
-      "description": "signed identifier",
-      "type": "object",
-      "required": [
-        "Id",
-        "AccessPolicy"
-      ],
-      "properties": {
-        "Id": {
-          "type": "string",
-          "description": "a unique id"
-        },
-        "AccessPolicy": {
-          "description": "The access policy",
-          "$ref": "#/definitions/AccessPolicy"
-        }
-      }
-    },
-    "SignedIdentifiers": {
-      "description": "a collection of signed identifiers",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/SignedIdentifier",
-        "xml": {
-          "name": "SignedIdentifier"
-        }
-      },
-      "xml": {
-        "wrapped": true,
-        "name": "SignedIdentifiers"
-      }
-    },
-    "StorageServiceProperties": {
-      "description": "Storage Service Properties.",
-      "type": "object",
-      "properties": {
-        "Logging": {
-          "description": "Azure Analytics Logging settings",
-          "$ref": "#/definitions/Logging"
-        },
-        "HourMetrics": {
-          "description": "A summary of request statistics grouped by API in hourly aggregates for queues",
-          "$ref": "#/definitions/Metrics"
-        },
-        "MinuteMetrics": {
-          "description": "a summary of request statistics grouped by API in minute aggregates for queues",
-          "$ref": "#/definitions/Metrics"
-        },
-        "Cors": {
-          "description": "The set of CORS rules.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/CorsRule",
-            "xml": {
-              "name": "CorsRule"
-            }
-          },
-          "xml": {
-            "wrapped": true
-          }
-        }
-      }
-    },
-    "StorageServiceStats": {
-      "description": "Stats for the storage service.",
-      "type": "object",
-      "properties": {
-        "GeoReplication": {
-          "description": "Geo-Replication information for the Secondary Storage Service",
-          "$ref": "#/definitions/GeoReplication"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "Url": {
-      "name": "url",
-      "description": "The URL of the service account, queue or message that is the targe of the desired operation.",
-      "required": true,
-      "type": "string",
-      "in": "path",
-      "x-ms-skip-url-encoding": true
-    },
-    "ApiVersionParameter": {
-      "name": "x-ms-version",
-      "x-ms-client-name": "version",
-      "in": "header",
-      "required": true,
-      "type": "string",
-      "description": "Specifies the version of the operation to use for this request.",
-      "enum": [
-        "2018-03-28"
-      ]
-    },
-    "Body": {
-      "name": "body",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "type": "object",
-        "format": "file"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Initial data"
-    },
-    "QueueAcl": {
-      "name": "queueAcl",
-      "in": "body",
-      "schema": {
-        "$ref": "#/definitions/SignedIdentifiers"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "the acls for the queue"
-    },
-    "ClientRequestId": {
-      "name": "x-ms-client-request-id",
-      "x-ms-client-name": "requestId",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled."
-    },
-    "ContentLength": {
-      "name": "Content-Length",
-      "in": "header",
-      "required": true,
-      "type": "integer",
-      "format": "int64",
-      "x-ms-parameter-location": "method",
-      "description": "The length of the request."
-    },
-    "ListQueuesInclude": {
-      "name": "include", 
-      "in": "query", 
-      "required": false, 
-      "type": "array",
-      "collectionFormat": "csv",
-      "items": {
-      "type": "string", 
-      "enum": [ 
-        "metadata" 
-      ], 
-      "x-ms-enum": { 
-        "name": "ListQueuesIncludeType", 
-        "modelAsString": false 
-        }
-      },
-      "x-ms-parameter-location": "method",
-      "description": "Include this parameter to specify that the queues's metadata be returned as part of the response body."
-    },
-    "Marker": {
-      "name": "marker",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "A string value that identifies the portion of the list of queues to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all queues remaining to be listed with the current page. The NextMarker value can be used as the value for the marker parameter in a subsequent call to request the next page of list items. The marker value is opaque to the client.",
-      "x-ms-parameter-location": "method"
-    },
-    "MaxResults": {
-      "name": "maxresults",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 1,
-      "x-ms-parameter-location": "method",
-      "description": "Specifies the maximum number of queues to return. If the request does not specify maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the listing operation crosses a partition boundary, then the service will return a continuation token for retrieving the remainder of the results. For this reason, it is possible that the service will return fewer results than specified by maxresults, or than the default of 5000."
-    },
-    "MessageId": {
-      "name": "messageid",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The message ID name."
-    },
-    "MessageTTL": {
-      "name": "messagettl",
-      "x-ms-client-name": "MessageTimeToLive",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": -1,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the time-to-live interval for the message, in seconds. Prior to version 2017-07-29, the maximum time-to-live allowed is 7 days. For version 2017-07-29 or later, the maximum time-to-live can be any positive number, as well as -1 indicating that the message does not expire. If this parameter is omitted, the default time-to-live is 7 days."
-    },
-    "Metadata": {
-      "name": "x-ms-meta",
-      "x-ms-client-name": "metadata",
-      "in": "header",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Include this parameter to specify that the queue's metadata be returned as part of the response body. Note that metadata requested with this parameter must be stored in accordance with the naming restrictions imposed by the 2009-09-19 version of the Queue service. Beginning with this version, all metadata names must adhere to the naming conventions for C# identifiers.",
-      "x-ms-header-collection-prefix": "x-ms-meta-"
-    },
-    "NumOfMessages": {
-      "name": "numofmessages",
-      "x-ms-client-name": "numberOfMessages",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 1,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation."
-    },
-    "PopReceipt": {
-      "name": "popreceipt",
-      "x-ms-client-name": "popReceipt",
-      "in": "query",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "description": "Required. Specifies the valid pop receipt value returned from an earlier call to the Get Messages or Update Message operation.",
-      "type": "string"
-    },
-    "Prefix": {
-      "name": "prefix",
-      "in": "query",
-      "required": false,
-      "type": "string",
-      "description": "Filters the results to return only queues whose name begins with the specified prefix.",
-      "x-ms-parameter-location": "method"
-    },
-    "QueueMessage": {
-      "name": "QueueMessage",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/QueueMessage"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "A Message object which can be stored in a Queue"
-    },
-    "QueueName": {
-      "name": "queueName",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method",
-      "description": "The queue name."
-    },
-    "StorageServiceProperties": {
-      "name": "StorageServiceProperties",
-      "in": "body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/StorageServiceProperties"
-      },
-      "x-ms-parameter-location": "method",
-      "description": "The StorageService properties."
-    },
-    "Timeout": {
-      "name": "timeout",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 0,
-      "x-ms-parameter-location": "method",
-      "description": "The The timeout parameter is expressed in seconds. For more information, see <a href=\"https://docs.microsoft.com/en-us/rest/api/storageservices/setting-timeouts-for-queue-service-operations>Setting Timeouts for Queue Service Operations.</a>"
-    },
-    "VisibilityTimeout": {
-      "name": "visibilitytimeout",
-      "in": "query",
-      "required": false,
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 604800,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
-    },
-    "VisibilityTimeoutRequired": {
-      "name": "visibilitytimeout",
-      "in": "query",
-      "required": true,
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 604800,
-      "x-ms-parameter-location": "method",
-      "description": "Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time."
-    }
-  }
-}
\ No newline at end of file

From 98341e78075332af557d14a883d434f62e32b970 Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Thu, 15 Aug 2019 14:10:11 -0700
Subject: [PATCH 17/22] Added spock test framework and tests for queue service
 (#4940)

* Migrate queue to spock test framework

* Remove all Junit tests and dependencies
---
 sdk/storage/azure-storage-queue/pom.xml       |  22 +-
 .../azure/storage/queue/QueueAsyncClient.java |   3 +
 .../storage/queue/QueueClientBuilder.java     |   1 -
 .../queue/models/StorageErrorCode.java        |   5 +
 .../storage/queue/QueueAsyncClientTests.java  | 693 ------------------
 .../azure/storage/queue/QueueClientTests.java | 653 -----------------
 .../storage/queue/QueueClientTestsBase.java   | 148 ----
 .../queue/QueueServiceAsyncClientTests.java   | 251 -------
 .../queue/QueueServiceClientTests.java        | 255 -------
 .../queue/QueueServiceClientTestsBase.java    |  66 --
 .../com/azure/storage/queue/TestHelpers.java  | 161 ----
 .../azure/storage/queue/spock/APISpec.groovy  | 123 ++++
 .../storage/queue/spock/QueueAPITests.groovy  | 446 +++++++++++
 .../queue/spock/QueueAysncAPITests.groovy     | 511 +++++++++++++
 .../queue/spock/QueueServiceAPITests.groovy   | 170 +++++
 .../spock/QueueServiceAsyncAPITests.groovy    | 200 +++++
 .../queue/spock/QueueTestHelper.groovy        | 161 ++++
 ...e.json => QueueAPITestsClearMessages.json} |  89 +--
 .../QueueAPITestsClearMessagesError.json      |  23 +
 ...QueueAPITestsCreateQueueWithSharedKey.json |  20 +
 .../QueueAPITestsDeleteExistQueue.json        |  36 +
 ...s.json => QueueAPITestsDeleteMessage.json} | 101 ++-
 ...ueueAPITestsDeleteMessageInvalidArgs0.json |  77 ++
 ...eueAPITestsDeleteMessageInvalidArgs1.json} |  61 +-
 ...ueueAPITestsDeleteMessageInvalidArgs2.json |  77 ++
 ...son => QueueAPITestsDeleteQueueError.json} |  12 +-
 .../QueueAPITestsDequeueMessage.json          |  58 ++
 .../QueueAPITestsDequeueMultipleMessages.json |  77 ++
 .../QueueAPITestsDequeueTooManyMessage.json   |  39 +
 .../QueueAPITestsEnqueueEmptyMessage.json     |  58 ++
 .../QueueAPITestsEnqueueMessage.json          |  58 ++
 .../QueueAPITestsEnqueueTimeToLive.json       |  39 +
 .../QueueAPITestsGetAccessPolicy.json         |  39 +
 .../QueueAPITestsGetAccessPolicyError.json    |  23 +
 .../QueueAPITestsGetProperties.json           |  39 +
 .../QueueAPITestsGetPropertiesError.json      |  23 +
 .../QueueAPITestsPeekMessage.json             |  58 ++
 .../QueueAPITestsPeekMessagesError.json       |  23 +
 .../QueueAPITestsPeekMultipleMessages.json    |  77 ++
 .../QueueAPITestsPeekTooManyMessage.json      |  39 +
 ...json => QueueAPITestsSetAccessPolicy.json} |  58 +-
 ...=> QueueAPITestsSetAndClearMetadata0.json} |  48 +-
 .../QueueAPITestsSetAndClearMetadata1.json    |  74 ++
 ...=> QueueAPITestsSetAndClearMetadata2.json} |  49 +-
 .../QueueAPITestsSetAndClearMetadata3.json    |  74 ++
 ...=> QueueAPITestsSetAndClearMetadata4.json} |  44 +-
 .../QueueAPITestsSetInvalidAccessPolicy.json  |  40 +
 .../QueueAPITestsSetInvalidMeta0.json         |  38 +
 .../QueueAPITestsSetInvalidMeta1.json         |  39 +
 .../QueueAPITestsSetInvalidMeta2.json         |  39 +
 .../QueueAPITestsSetInvalidMeta3.json         |  39 +
 .../QueueAPITestsSetMetadataQueueError.json   |  23 +
 ...ueueAPITestsSetMultipleAccessPolicies.json |  56 ++
 ...ueueAPITestsSetTooManyAccessPolicies.json} |  37 +-
 .../QueueAPITestsUpdateMessage.json           |  96 +++
 ...ueueAPITestsUpdateMessageInvalidArgs0.json |  78 ++
 ...ueueAPITestsUpdateMessageInvalidArgs1.json |  78 ++
 ...ueueAPITestsUpdateMessageInvalidArgs2.json |  78 ++
 .../QueueAysncAPITestsClearMessages.json      | 129 ++++
 .../QueueAysncAPITestsClearMessagesError.json |  23 +
 ...AysncAPITestsCreateQueueWithSharedKey.json |  20 +
 .../QueueAysncAPITestsDeleteExistQueue.json   |  36 +
 .../QueueAysncAPITestsDeleteMessage.json      | 148 ++++
 ...ysncAPITestsDeleteMessageInvalidArgs0.json |  77 ++
 ...ysncAPITestsDeleteMessageInvalidArgs1.json |  77 ++
 ...ysncAPITestsDeleteMessageInvalidArgs2.json |  77 ++
 .../QueueAysncAPITestsDeleteQueueError.json   |  23 +
 .../QueueAysncAPITestsDequeueMessage.json     |  58 ++
 ...eAysncAPITestsDequeueMultipleMessages.json |  77 ++
 ...eueAysncAPITestsDequeueTooManyMessage.json |  39 +
 ...QueueAysncAPITestsEnqueueEmptyMessage.json |  39 +
 .../QueueAysncAPITestsEnqueueMessage.json     |  39 +
 .../QueueAysncAPITestsEnqueueTimeToLive.json  |  39 +
 .../QueueAysncAPITestsGetAccessPolicy.json    |  39 +
 ...AysncAPITestsGetAccessPolicyDoesError.json |  23 +
 .../QueueAysncAPITestsGetProperties.json      |  39 +
 .../QueueAysncAPITestsGetPropertiesError.json |  23 +
 .../QueueAysncAPITestsPeekMessage.json        |  58 ++
 .../QueueAysncAPITestsPeekMessagesError.json  |  23 +
 ...ueueAysncAPITestsPeekMultipleMessages.json |  77 ++
 .../QueueAysncAPITestsPeekTooManyMessage.json |  39 +
 .../QueueAysncAPITestsSetAccessPolicy.json    |  56 ++
 ...ueueAysncAPITestsSetAndClearMetadata0.json |  73 ++
 ...eueAysncAPITestsSetAndClearMetadata1.json} |  55 +-
 ...ueueAysncAPITestsSetAndClearMetadata2.json |  73 ++
 ...ueueAysncAPITestsSetAndClearMetadata3.json |  74 ++
 ...eueAysncAPITestsSetAndClearMetadata4.json} |  44 +-
 ...ueAysncAPITestsSetInvalidAccessPolicy.json |  40 +
 .../QueueAysncAPITestsSetInvalidMeta0.json    |  38 +
 .../QueueAysncAPITestsSetInvalidMeta1.json    |  39 +
 .../QueueAysncAPITestsSetInvalidMeta2.json    |  39 +
 .../QueueAysncAPITestsSetInvalidMeta3.json    |  39 +
 ...eueAysncAPITestsSetMetadataQueueError.json |  23 +
 ...ysncAPITestsSetMultipleAccessPolicies.json |  56 ++
 ...AysncAPITestsSetTooManyAccessPolicies.json |  40 +
 .../QueueAysncAPITestsUpdateMessage.json      |  96 +++
 ...ysncAPITestsUpdateMessageInvalidArgs0.json |  78 ++
 ...ysncAPITestsUpdateMessageInvalidArgs1.json |  78 ++
 ...ysncAPITestsUpdateMessageInvalidArgs2.json |  78 ++
 .../QueueServiceAPITestsCreateNull.json       |   4 +
 .../QueueServiceAPITestsCreateQueue.json      |  39 +
 ...erviceAPITestsCreateQueueMaxOverload0.json |  39 +
 ...erviceAPITestsCreateQueueMaxOverload1.json |  39 +
 ...erviceAPITestsCreateQueueMaxOverload2.json |  39 +
 ...PITestsCreateQueueWithInvalidMetadata.json |  21 +
 ...ceAPITestsCreateQueueWithInvalidName0.json |  23 +
 ...ceAPITestsCreateQueueWithInvalidName1.json |  23 +
 ...ceAPITestsCreateQueueWithInvalidName2.json |  23 +
 ...ceAPITestsCreateQueueWithInvalidName3.json |  23 +
 ...ceAPITestsCreateQueueWithInvalidName4.json |  23 +
 ...ceAPITestsCreateQueueWithInvalidName5.json |  23 +
 .../QueueServiceAPITestsDeleteQueue.json      |  56 ++
 .../QueueServiceAPITestsDeleteQueueError.json |  23 +
 ...eueServiceAPITestsGetAndSetProperties.json |  78 ++
 .../QueueServiceAPITestsGetQueueClient.json   |   4 +
 .../QueueServiceAPITestsListEmptyQueues.json  |  23 +
 ...n => QueueServiceAPITestsListQueues0.json} |  78 +-
 ...n => QueueServiceAPITestsListQueues1.json} | 118 +--
 ...n => QueueServiceAPITestsListQueues2.json} |  89 ++-
 .../QueueServiceAsyncAPITestsCreateNull.json  |   4 +
 .../QueueServiceAsyncAPITestsCreateQueue.json |  39 +
 ...eAsyncAPITestsCreateQueueMaxOverload0.json |  39 +
 ...eAsyncAPITestsCreateQueueMaxOverload1.json |  39 +
 ...eAsyncAPITestsCreateQueueMaxOverload2.json |  39 +
 ...PITestsCreateQueueWithInvalidMetadata.json |  21 +
 ...ncAPITestsCreateQueueWithInvalidName0.json |  23 +
 ...ncAPITestsCreateQueueWithInvalidName1.json |  23 +
 ...ncAPITestsCreateQueueWithInvalidName2.json |  23 +
 ...ncAPITestsCreateQueueWithInvalidName3.json |  23 +
 ...ncAPITestsCreateQueueWithInvalidName4.json |  23 +
 ...ncAPITestsCreateQueueWithInvalidName5.json |  23 +
 .../QueueServiceAsyncAPITestsDeleteQueue.json |  56 ++
 ...ServiceAsyncAPITestsDeleteQueueError.json} |  12 +-
 ...rviceAsyncAPITestsGetAndSetProperties.json |  59 ++
 ...eueServiceAsyncAPITestsGetQueueClient.json |   4 +
 ...ueServiceAsyncAPITestsListEmptyQueues.json |   4 +
 ...QueueServiceAsyncAPITestsListQueues0.json} |  50 +-
 ...QueueServiceAsyncAPITestsListQueues1.json} |  76 +-
 ...QueueServiceAsyncAPITestsListQueues2.json} |  74 +-
 .../clearMessagesQueueDoesNotExist.json       |  42 --
 .../createQueueTwiceDifferentMetadata.json    |  90 ---
 .../session-records/deleteExisting.json       |  94 ---
 .../deleteMessageInvalidMessageId.json        | 109 ---
 .../deleteMessageInvalidPopReceipt.json       | 109 ---
 .../deleteMessageQueueDoesNotExist.json       |  42 --
 .../session-records/deleteMetadata.json       | 106 ---
 .../session-records/deleteNonExistent.json    |  42 --
 .../deleteNonExistentQueue.json               |  42 --
 .../dequeueMultipleMessages.json              | 109 ---
 .../dequeueQueueDoesNotExist.json             |  42 --
 .../dequeueTooManyMessages.json               |  71 --
 .../session-records/enqueueEmptyMessage.json  |  90 ---
 .../session-records/enqueueMessage.json       |  90 ---
 .../enqueueQueueDoesNotExist.json             |  43 --
 .../enqueueShortTimeToLiveMessage.json        |  90 ---
 .../getAccessPolicyQueueDoesNotExist.json     |  42 --
 .../getPropertiesQueueDoesNotExist.json       |  42 --
 .../getQueueDoesNotCreateAQueue.json          |  43 --
 .../listQueuesIncludeMetadata.json            | 186 -----
 .../session-records/listQueuesWithLimit.json  | 205 ------
 .../session-records/listQueuesWithPrefix.json | 186 -----
 .../session-records/peekMessage.json          |  90 ---
 .../session-records/peekMultipleMessages.json | 109 ---
 .../peekQueueDoesNotExist.json                |  42 --
 .../session-records/peekTooManyMessages.json  |  71 --
 .../setInvalidAccessPolicy.json               |  72 --
 .../session-records/setInvalidMetadata.json   |  71 --
 .../session-records/setMetadata.json          |  88 ---
 .../setMetadataQueueDoesNotExist.json         |  42 --
 .../session-records/setProperties.json        | 114 ---
 .../setTooManyAccessPolicies.json             |  72 --
 .../updateMessageInvalidMessageId.json        | 110 ---
 .../updateMessageInvalidPopReceipt.json       | 110 ---
 .../updateMessageQueueDoesNotExist.json       |  43 --
 174 files changed, 6826 insertions(+), 5809 deletions(-)
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/TestHelpers.java
 create mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/APISpec.groovy
 create mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAPITests.groovy
 create mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAysncAPITests.groovy
 create mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAPITests.groovy
 create mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAsyncAPITests.groovy
 create mode 100644 sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueTestHelper.groovy
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{updateMessage.json => QueueAPITestsClearMessages.json} (54%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessagesError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsCreateQueueWithSharedKey.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteExistQueue.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{clearMessages.json => QueueAPITestsDeleteMessage.json} (53%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs0.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{dequeueMessage.json => QueueAPITestsDeleteMessageInvalidArgs1.json} (51%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs2.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createWithSharedKey.json => QueueAPITestsDeleteQueueError.json} (64%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMultipleMessages.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueTooManyMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueEmptyMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueTimeToLive.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicy.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicyError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetProperties.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetPropertiesError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessagesError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMultipleMessages.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekTooManyMessage.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{setAccessPolicy.json => QueueAPITestsSetAccessPolicy.json} (50%)
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{getAccessPolicy.json => QueueAPITestsSetAndClearMetadata0.json} (59%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata1.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createTwiceSameMetadata.json => QueueAPITestsSetAndClearMetadata2.json} (58%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata3.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{getProperties.json => QueueAPITestsSetAndClearMetadata4.json} (62%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidAccessPolicy.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMetadataQueueError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMultipleAccessPolicies.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{setAccessPolicyQueueDoesNotExist.json => QueueAPITestsSetTooManyAccessPolicies.json} (55%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessages.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessagesError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsCreateQueueWithSharedKey.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteExistQueue.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteQueueError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMultipleMessages.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueTooManyMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueEmptyMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueTimeToLive.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicy.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicyDoesError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetProperties.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetPropertiesError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessagesError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMultipleMessages.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekTooManyMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAccessPolicy.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata0.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createTwiceDifferentMetadata.json => QueueAysncAPITestsSetAndClearMetadata1.json} (58%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata3.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createWithMetadata.json => QueueAysncAPITestsSetAndClearMetadata4.json} (62%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidAccessPolicy.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMetadataQueueError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMultipleAccessPolicies.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetTooManyAccessPolicies.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessage.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateNull.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueue.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidMetadata.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName3.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName4.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName5.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueue.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueueError.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetAndSetProperties.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetQueueClient.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListEmptyQueues.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createQueueTwiceSameMetadata.json => QueueServiceAPITestsListQueues0.json} (54%)
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{listQueues.json => QueueServiceAPITestsListQueues1.json} (51%)
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{deleteMessage.json => QueueServiceAPITestsListQueues2.json} (53%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateNull.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueue.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidMetadata.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName0.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName1.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName2.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName3.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName4.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName5.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueue.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createWithSASToken.json => QueueServiceAsyncAPITestsDeleteQueueError.json} (68%)
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetAndSetProperties.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetQueueClient.json
 create mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListEmptyQueues.json
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{deleteExistingQueue.json => QueueServiceAsyncAPITestsListQueues0.json} (57%)
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createQueue.json => QueueServiceAsyncAPITestsListQueues1.json} (50%)
 rename sdk/storage/azure-storage-queue/src/test/resources/session-records/{createQueueWithMetadata.json => QueueServiceAsyncAPITestsListQueues2.json} (51%)
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExisting.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMetadata.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistent.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistentQueue.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMultipleMessages.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueTooManyMessages.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueEmptyMessage.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueMessage.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesIncludeMetadata.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithLimit.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithPrefix.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMessage.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMultipleMessages.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/peekQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/peekTooManyMessages.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidAccessPolicy.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidMetadata.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadata.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/setProperties.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/setTooManyAccessPolicies.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidMessageId.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json
 delete mode 100644 sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json

diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index f80a5afff324..f67c81028a75 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -54,20 +54,11 @@
       <version>1.0.0-preview.4</version>
       <scope>test</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.spockframework/spock-core -->
     <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-identity</artifactId>
-      <version>1.0.0-preview.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>1.3-groovy-2.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -75,10 +66,5 @@
       <artifactId>reactor-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>adal4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
index 659d128dc243..86931937896f 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -24,6 +24,7 @@
 import com.azure.storage.queue.models.SignedIdentifier;
 import com.azure.storage.queue.models.StorageErrorException;
 import com.azure.storage.queue.models.UpdatedMessage;
+import java.util.Objects;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -62,6 +63,7 @@ public final class QueueAsyncClient {
      * @param queueName Name of the queue
      */
     QueueAsyncClient(AzureQueueStorageImpl client, String queueName) {
+        Objects.requireNonNull(queueName);
         this.queueName = queueName;
 
         this.client = new AzureQueueStorageBuilder().pipeline(client.getHttpPipeline())
@@ -79,6 +81,7 @@ public final class QueueAsyncClient {
      * @param queueName Name of the queue
      */
     QueueAsyncClient(URL endpoint, HttpPipeline httpPipeline, String queueName) {
+        Objects.requireNonNull(queueName);
         this.queueName = queueName;
 
         this.client = new AzureQueueStorageBuilder().pipeline(httpPipeline)
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
index 944bba023606..73583db7f684 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -140,7 +140,6 @@ public QueueClient buildClient() {
      */
     public QueueAsyncClient buildAsyncClient() {
         Objects.requireNonNull(endpoint);
-        Objects.requireNonNull(queueName);
 
         if (sasTokenCredential == null && sharedKeyCredential == null && bearerTokenCredential == null) {
             LOGGER.logExceptionAsError(new IllegalArgumentException("Credentials are required for authorization"));
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java
index dfa27d5fed94..a7366b0a8b6b 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java
@@ -27,6 +27,11 @@ public final class StorageErrorCode extends ExpandableStringEnum<StorageErrorCod
      */
     public static final StorageErrorCode ACCOUNT_IS_DISABLED = fromString("AccountIsDisabled");
 
+    /**
+     * Static value AuthenticationError for StorageErrorCode.
+     */
+    public static final StorageErrorCode AUTHENTICATION_ERROR = fromString("AuthenticationError");
+
     /**
      * Static value AuthenticationFailed for StorageErrorCode.
      */
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
deleted file mode 100644
index e2b4b9529d00..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAsyncClientTests.java
+++ /dev/null
@@ -1,693 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.AccessPolicy;
-import com.azure.storage.queue.models.DequeuedMessage;
-import com.azure.storage.queue.models.SignedIdentifier;
-import com.azure.storage.queue.models.StorageErrorException;
-import reactor.test.StepVerifier;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-public class QueueAsyncClientTests extends QueueClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueAsyncClientTests.class);
-
-    private QueueAsyncClient client;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildAsyncClient(), true, logger);
-        } else {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildAsyncClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        try {
-            client.clearMessages().block();
-            client.delete().block();
-        } catch (StorageErrorException ex) {
-            // Queue already delete, that's what we wanted anyways.
-        }
-    }
-
-    @Override
-    public void createWithSharedKey() {
-
-    }
-
-    @Override
-    public void createWithSASToken() {
-        // Need to find a way to get SAS tokens from the storage account
-    }
-
-    @Override
-    public void createWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void createTwiceSameMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-    }
-
-    @Override
-    public void createTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.create(metadata))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 409));
-    }
-
-    @Override
-    public void deleteExisting() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage("This queue will be deleted"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.delete())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        helper.sleepInRecordMode(Duration.ofSeconds(30));
-
-        StepVerifier.create(client.enqueueMessage("This should fail"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void deleteNonExistent() {
-        StepVerifier.create(client.delete())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void getProperties() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void getPropertiesQueueDoesNotExist() {
-        StepVerifier.create(client.getProperties())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void setMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setMetadata(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void setMetadataQueueDoesNotExist() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.setMetadata(metadata))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void setInvalidMetadata() {
-        Map<String, String> badMetadata = Collections.singletonMap("", "bad metadata");
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setMetadata(badMetadata))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void deleteMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(client.create(metadata))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.setMetadata(null))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(Collections.EMPTY_MAP, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void getAccessPolicy() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getAccessPolicy())
-            .expectNextCount(0)
-            .verifyComplete();
-    }
-
-    @Override
-    public void getAccessPolicyQueueDoesNotExist() {
-        StepVerifier.create(client.getAccessPolicy())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void setAccessPolicy() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("raup")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("testpermission")
-            .accessPolicy(accessPolicy);
-
-        StepVerifier.create(client.setAccessPolicy(Collections.singletonList(permission)))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getAccessPolicy())
-            .assertNext(response -> helper.assertPermissionsAreEqual(permission, response))
-            .verifyComplete();
-    }
-
-    @Override
-    public void setAccessPolicyQueueDoesNotExist() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.now())
-            .expiry(OffsetDateTime.now());
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("test-permission")
-            .accessPolicy(accessPolicy);
-
-        StepVerifier.create(client.setAccessPolicy(Collections.singletonList(permission)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void setInvalidAccessPolicy() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
-            .accessPolicy(accessPolicy);
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setAccessPolicy(Collections.singletonList(permission)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void setTooManyAccessPolicies() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        List<SignedIdentifier> permissions = new ArrayList<>();
-        for (int i = 0; i < 6; i++) {
-            permissions.add(new SignedIdentifier()
-                .id("policy" + i)
-                .accessPolicy(accessPolicy));
-        }
-
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.setAccessPolicy(permissions))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void enqueueMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages())
-            .assertNext(peekedMessage -> assertEquals(messageText, peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void enqueueEmptyMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages())
-            .assertNext(peekedMessage -> assertNull(peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void enqueueShortTimeToLiveMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText, Duration.ofSeconds(0), Duration.ofSeconds(2)))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages().delaySubscription(Duration.ofSeconds(5)))
-            .expectNextCount(0)
-            .verifyComplete();
-    }
-
-    @Override
-    public void enqueueQueueDoesNotExist() {
-        StepVerifier.create(client.enqueueMessage("this should fail"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void dequeueMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.dequeueMessages())
-            .assertNext(dequeuedMessage -> assertEquals(messageText, dequeuedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void dequeueMultipleMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage(messageText2))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.dequeueMessages(2))
-            .assertNext(dequeuedMessage -> assertEquals(messageText, dequeuedMessage.messageText()))
-            .assertNext(dequeuedMessage -> assertEquals(messageText2, dequeuedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void dequeueTooManyMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.dequeueMessages(64))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void dequeueQueueDoesNotExist() {
-        StepVerifier.create(client.dequeueMessages())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void peekMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages())
-            .assertNext(peekedMessage -> assertEquals(messageText, peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void peekMultipleMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage(messageText2))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages(2))
-            .assertNext(peekedMessage -> assertEquals(messageText, peekedMessage.messageText()))
-            .assertNext(peekedMessage -> assertEquals(messageText2, peekedMessage.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void peekTooManyMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages(64))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void peekQueueDoesNotExist() {
-        StepVerifier.create(client.peekMessages())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void clearMessages() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.enqueueMessage("test message"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-        StepVerifier.create(client.enqueueMessage("test message"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-        StepVerifier.create(client.enqueueMessage("test message"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(3, response.value().approximateMessagesCount());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.clearMessages())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void clearMessagesQueueDoesNotExist() {
-        StepVerifier.create(client.clearMessages())
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void deleteMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-        StepVerifier.create(client.deleteMessage(dequeuedMessage.messageId(), dequeuedMessage.popReceipt()))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                helper.assertResponseStatusCode(response, 200);
-                assertEquals(0, response.value().approximateMessagesCount());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void deleteMessageInvalidMessageId() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = new DequeuedMessage();
-        StepVerifier.create(client.dequeueMessages())
-            .assertNext(response -> {
-                assertEquals(messageText, response.messageText());
-                dequeuedMessage.popReceipt(response.popReceipt()).messageId(response.messageId());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.deleteMessage(dequeuedMessage.messageId() + "random", dequeuedMessage.popReceipt()))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void deleteMessageInvalidPopReceipt() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = new DequeuedMessage();
-        StepVerifier.create(client.dequeueMessages())
-            .assertNext(response -> {
-                assertEquals(messageText, response.messageText());
-                dequeuedMessage.popReceipt(response.popReceipt()).messageId(response.messageId());
-            })
-            .verifyComplete();
-
-        StepVerifier.create(client.deleteMessage(dequeuedMessage.messageId(), dequeuedMessage.popReceipt() + "random"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void deleteMessageQueueDoesNotExist() {
-        StepVerifier.create(client.deleteMessage("invalid", "call"))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void updateMessage() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-
-        String updatedMessageText = "updated test message";
-        StepVerifier.create(client.updateMessage(updatedMessageText, dequeuedMessage.messageId(), dequeuedMessage.popReceipt(), Duration.ofSeconds(1)))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 204))
-            .verifyComplete();
-
-        StepVerifier.create(client.peekMessages().delaySubscription(Duration.ofSeconds(2)))
-            .assertNext(response -> assertEquals(updatedMessageText, response.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void updateMessageInvalidMessageId() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-
-        String updatedMessageText = "updated test message";
-        StepVerifier.create(client.updateMessage(updatedMessageText, dequeuedMessage.messageId() + "random", dequeuedMessage.popReceipt(), Duration.ofSeconds(1)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 404));
-    }
-
-    @Override
-    public void updateMessageInvalidPopReceipt() {
-        StepVerifier.create(client.create())
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        String messageText = "test message";
-        StepVerifier.create(client.enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        DequeuedMessage dequeuedMessage = client.dequeueMessages().blockFirst();
-        assertEquals(messageText, dequeuedMessage.messageText());
-
-        String updatedMessageText = "updated test message";
-        StepVerifier.create(client.updateMessage(updatedMessageText, dequeuedMessage.messageId(), dequeuedMessage.popReceipt() + "random", Duration.ofSeconds(1)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-
-    @Override
-    public void updateMessageQueueDoesNotExist() {
-        StepVerifier.create(client.updateMessage("queue", "doesn't", "exist", Duration.ofSeconds(5)))
-            .verifyErrorSatisfies(throwable -> helper.assertExceptionStatusCode(throwable, 400));
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
deleted file mode 100644
index 4e3f782d7ec6..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTests.java
+++ /dev/null
@@ -1,653 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.http.rest.Response;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.AccessPolicy;
-import com.azure.storage.queue.models.DequeuedMessage;
-import com.azure.storage.queue.models.PeekedMessage;
-import com.azure.storage.queue.models.QueueProperties;
-import com.azure.storage.queue.models.SignedIdentifier;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.UpdatedMessage;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-public class QueueClientTests extends QueueClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueClientTests.class);
-
-    private QueueClient client;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildClient(), true, logger);
-        } else {
-            client = helper.setupClient((connectionString, endpoint) -> new QueueClientBuilder()
-                .connectionString(connectionString)
-                .queueName(queueName)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        try {
-            client.clearMessages();
-            client.delete();
-        } catch (StorageErrorException ex) {
-            // Queue already delete, that's what we wanted anyways.
-        }
-    }
-
-    @Override
-    public void createWithSharedKey() {
-
-    }
-
-    @Override
-    public void createWithSASToken() {
-        // Need to find a way to get SAS tokens from the storage account
-    }
-
-    @Override
-    public void createWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-
-        QueueProperties properties = client.getProperties().value();
-        assertEquals(metadata, properties.metadata());
-    }
-
-    @Override
-    public void createTwiceSameMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-        helper.assertResponseStatusCode(client.create(metadata), 204);
-    }
-
-    @Override
-    public void createTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.create(metadata);
-            fail("Creating a queue twice with different metadata values should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 409);
-        }
-    }
-
-    @Override
-    public void deleteExisting() {
-        helper.assertResponseStatusCode(client.create(), 201);
-        helper.assertResponseStatusCode(client.enqueueMessage("This queue will be deleted"), 201);
-        helper.assertResponseStatusCode(client.delete(), 204);
-
-        helper.sleepInRecordMode(Duration.ofSeconds(30));
-
-        try {
-            client.enqueueMessage("This should fail");
-            fail("Attempting to work with a queue that has been deleted should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteNonExistent() {
-        try {
-            client.delete();
-            fail("Attempting to delete a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void getProperties() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(metadata, response.value().metadata());
-    }
-
-    @Override
-    public void getPropertiesQueueDoesNotExist() {
-        try {
-            client.getProperties();
-            fail("Attempting to get properties of a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void setMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        helper.assertResponseStatusCode(client.setMetadata(metadata), 204);
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(metadata, response.value().metadata());
-    }
-
-    @Override
-    public void setMetadataQueueDoesNotExist() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        try {
-            client.setMetadata(metadata);
-            fail("Attempting to set metadata on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void setInvalidMetadata() {
-        Map<String, String> badMetadata = Collections.singletonMap("", "bad metadata");
-
-        helper.assertResponseStatusCode(client.create(), 201);
-        try {
-            client.setMetadata(badMetadata);
-            fail("Attempting to set invalid metadata on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void deleteMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        helper.assertResponseStatusCode(client.create(metadata), 201);
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(metadata, response.value().metadata());
-
-        helper.assertResponseStatusCode(client.setMetadata(null), 204);
-
-        response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-        assertEquals(Collections.EMPTY_MAP, response.value().metadata());
-    }
-
-    @Override
-    public void getAccessPolicy() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        Iterable<SignedIdentifier> accessPolicies = client.getAccessPolicy();
-        assertFalse(accessPolicies.iterator().hasNext());
-    }
-
-    @Override
-    public void getAccessPolicyQueueDoesNotExist() {
-        try {
-            client.getAccessPolicy().iterator().hasNext();
-            fail("Attempting to get access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void setAccessPolicy() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("raup")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("testpermission")
-            .accessPolicy(accessPolicy);
-
-        helper.assertResponseStatusCode(client.setAccessPolicy(Collections.singletonList(permission)), 204);
-
-        Iterator<SignedIdentifier> accessPolicies = client.getAccessPolicy().iterator();
-        helper.assertPermissionsAreEqual(permission, accessPolicies.next());
-        assertFalse(accessPolicies.hasNext());
-    }
-
-    @Override
-    public void setAccessPolicyQueueDoesNotExist() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.now())
-            .expiry(OffsetDateTime.now());
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("test-permission")
-            .accessPolicy(accessPolicy);
-
-        try {
-            client.setAccessPolicy(Collections.singletonList(permission));
-            fail("Attempting to set access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void setInvalidAccessPolicy() {
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        SignedIdentifier permission = new SignedIdentifier()
-            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
-            .accessPolicy(accessPolicy);
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.setAccessPolicy(Collections.singletonList(permission));
-            fail("Attempting to set invalid access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void setTooManyAccessPolicies() {
-        List<SignedIdentifier> permissions = new ArrayList<>();
-
-        AccessPolicy accessPolicy = new AccessPolicy()
-            .permission("r")
-            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
-            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC));
-
-        for (int i = 0; i < 6; i++) {
-            permissions.add(new SignedIdentifier()
-                .id("policy" + i)
-                .accessPolicy(accessPolicy));
-        }
-
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.setAccessPolicy(permissions);
-            fail("Attempting to set more than five access policies on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void enqueueMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void enqueueEmptyMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertNull(response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void enqueueShortTimeToLiveMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText, Duration.ofSeconds(0), Duration.ofSeconds(2)), 201);
-
-        helper.sleepInRecordMode(Duration.ofSeconds(5));
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void enqueueQueueDoesNotExist() {
-        try {
-            client.enqueueMessage("This should fail");
-            fail("Attempting to enqueue a message on a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void dequeueMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void dequeueMultipleMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText2), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages(2).iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertEquals(messageText2, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void dequeueTooManyMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.dequeueMessages(64).iterator().hasNext();
-            fail("Attempting to get more than 32 messages from a queue should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void dequeueQueueDoesNotExist() {
-        try {
-            client.dequeueMessages().iterator().hasNext();
-            fail("Attempting to get messages from a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void peekMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages().iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void peekMultipleMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        String messageText2 = "test message 2";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText2), 201);
-
-        Iterator<PeekedMessage> response = client.peekMessages(2).iterator();
-        assertEquals(messageText, response.next().messageText());
-        assertEquals(messageText2, response.next().messageText());
-        assertFalse(response.hasNext());
-    }
-
-    @Override
-    public void peekTooManyMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        try {
-            client.peekMessages(64).iterator().hasNext();
-            fail("Attempting to peek more than 32 messages from a queue should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void peekQueueDoesNotExist() {
-        try {
-            client.peekMessages().iterator().hasNext();
-            fail("Attempting to peek messages from a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void clearMessages() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        for (int i = 0; i < 3; i++) {
-            helper.assertResponseStatusCode(client.enqueueMessage("test message"), 201);
-        }
-
-        Response<QueueProperties> response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(3, response.value().approximateMessagesCount());
-
-        helper.assertResponseStatusCode(client.clearMessages(), 204);
-
-        response = client.getProperties();
-        helper.assertResponseStatusCode(response, 200);
-        assertEquals(0, response.value().approximateMessagesCount());
-    }
-
-    @Override
-    public void clearMessagesQueueDoesNotExist() {
-        try {
-            client.clearMessages();
-            fail("Attempting to clear messages of a queue that doesn't exist should throw an exception");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertFalse(response.hasNext());
-        assertEquals(messageText, message.messageText());
-
-        helper.assertResponseStatusCode(client.deleteMessage(message.messageId(), message.popReceipt()), 204);
-
-        Response<QueueProperties> propertiesResponse = client.getProperties();
-        helper.assertResponseStatusCode(propertiesResponse, 200);
-        assertEquals(0, propertiesResponse.value().approximateMessagesCount());
-    }
-
-    @Override
-    public void deleteMessageInvalidMessageId() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertFalse(response.hasNext());
-        assertEquals(messageText, message.messageText());
-
-        try {
-            client.deleteMessage(message.messageId() + "random", message.popReceipt());
-            fail("Attempting to delete a message with an invalid ID should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteMessageInvalidPopReceipt() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertFalse(response.hasNext());
-        assertEquals(messageText, message.messageText());
-
-        try {
-            client.deleteMessage(message.messageId(), message.popReceipt() + "random");
-            fail("Attempting to delete a message with an invalid popReceipt should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void deleteMessageQueueDoesNotExist() {
-        try {
-            client.deleteMessage("invalid", "call");
-            fail("Attempting to delete a message from a queue that doesn't exist should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void updateMessage() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertEquals(messageText, message.messageText());
-        assertFalse(response.hasNext());
-
-        String updatedMessageText = "updated test message";
-        Response<UpdatedMessage> updatedMessageResponse = client.updateMessage(updatedMessageText, message.messageId(), message.popReceipt(), Duration.ofSeconds(1));
-        helper.assertResponseStatusCode(updatedMessageResponse, 204);
-
-        helper.sleepInRecordMode(Duration.ofSeconds(2));
-
-        Iterator<PeekedMessage> peekedMessageIterator = client.peekMessages().iterator();
-        PeekedMessage peekedMessage = peekedMessageIterator.next();
-        assertEquals(updatedMessageText, peekedMessage.messageText());
-        assertFalse(peekedMessageIterator.hasNext());
-    }
-
-    @Override
-    public void updateMessageInvalidMessageId() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertEquals(messageText, message.messageText());
-        assertFalse(response.hasNext());
-
-        String updatedMessageText = "updated test message";
-        try {
-            client.updateMessage(updatedMessageText, message.messageId() + "random", message.popReceipt(), Duration.ofSeconds(1));
-            fail("Attempting to update a message with an invalid ID should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void updateMessageInvalidPopReceipt() {
-        helper.assertResponseStatusCode(client.create(), 201);
-
-        String messageText = "test message";
-        helper.assertResponseStatusCode(client.enqueueMessage(messageText), 201);
-
-        Iterator<DequeuedMessage> response = client.dequeueMessages().iterator();
-        DequeuedMessage message = response.next();
-        assertEquals(messageText, message.messageText());
-        assertFalse(response.hasNext());
-
-        String updatedMessageText = "updated test message";
-        try {
-            client.updateMessage(updatedMessageText, message.messageId(), message.popReceipt() + "random", Duration.ofSeconds(1));
-            fail("Attempting to update a message with an invalid popReceipt should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-
-    @Override
-    public void updateMessageQueueDoesNotExist() {
-        try {
-            client.updateMessage("queue", "doesn't", "exist", Duration.ofSeconds(5));
-            fail("Attempting to update a message on a queue that doesn't exist should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 400);
-        }
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java
deleted file mode 100644
index b83d9a1459bb..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueClientTestsBase.java
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.test.TestBase;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-public abstract class QueueClientTestsBase extends TestBase {
-    String queueName;
-    TestHelpers helper;
-
-    @Rule
-    public TestName testName = new TestName();
-
-    @Override
-    public String testName() {
-        return testName.getMethodName();
-    }
-
-    String getQueueName() {
-        return testResourceNamer.randomName("queue", 16).toLowerCase();
-    }
-
-    @Test
-    public abstract void createWithSharedKey();
-
-    @Test
-    public abstract void createWithSASToken();
-
-    @Test
-    public abstract void createWithMetadata();
-
-    @Test
-    public abstract void createTwiceSameMetadata();
-
-    @Test
-    public abstract void createTwiceDifferentMetadata();
-
-    @Test
-    public abstract void deleteExisting();
-
-    @Test
-    public abstract void deleteNonExistent();
-
-    @Test
-    public abstract void getProperties();
-
-    @Test
-    public abstract void getPropertiesQueueDoesNotExist();
-
-    @Test
-    public abstract void setMetadata();
-
-    @Test
-    public abstract void setMetadataQueueDoesNotExist();
-
-    @Test
-    public abstract void setInvalidMetadata();
-
-    @Test
-    public abstract void deleteMetadata();
-
-    @Test
-    public abstract void getAccessPolicy();
-
-    @Test
-    public abstract void getAccessPolicyQueueDoesNotExist();
-
-    @Test
-    public abstract void setAccessPolicy();
-
-    @Test
-    public abstract void setAccessPolicyQueueDoesNotExist();
-
-    @Test
-    public abstract void setInvalidAccessPolicy();
-
-    @Test
-    public abstract void setTooManyAccessPolicies();
-
-    @Test
-    public abstract void enqueueMessage();
-
-    @Test
-    public abstract void enqueueEmptyMessage();
-
-    @Test
-    public abstract void enqueueShortTimeToLiveMessage();
-
-    @Test
-    public abstract void enqueueQueueDoesNotExist();
-
-    @Test
-    public abstract void dequeueMessage();
-
-    @Test
-    public abstract void dequeueMultipleMessages();
-
-    @Test
-    public abstract void dequeueTooManyMessages();
-
-    @Test
-    public abstract void dequeueQueueDoesNotExist();
-
-    @Test
-    public abstract void peekMessage();
-
-    @Test
-    public abstract void peekMultipleMessages();
-
-    @Test
-    public abstract void peekTooManyMessages();
-
-    @Test
-    public abstract void peekQueueDoesNotExist();
-
-    @Test
-    public abstract void clearMessages();
-
-    @Test
-    public abstract void clearMessagesQueueDoesNotExist();
-
-    @Test
-    public abstract void deleteMessage();
-
-    @Test
-    public abstract void deleteMessageInvalidMessageId();
-
-    @Test
-    public abstract void deleteMessageInvalidPopReceipt();
-
-    @Test
-    public abstract void deleteMessageQueueDoesNotExist();
-
-    @Test
-    public abstract void updateMessage();
-
-    @Test
-    public abstract void updateMessageInvalidMessageId();
-
-    @Test
-    public abstract void updateMessageInvalidPopReceipt();
-
-    @Test
-    public abstract void updateMessageQueueDoesNotExist();
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java
deleted file mode 100644
index 1be35f6a8910..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceAsyncClientTests.java
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.Logging;
-import com.azure.storage.queue.models.Metrics;
-import com.azure.storage.queue.models.QueueItem;
-import com.azure.storage.queue.models.QueuesSegmentOptions;
-import com.azure.storage.queue.models.RetentionPolicy;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.StorageServiceProperties;
-import reactor.test.StepVerifier;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class QueueServiceAsyncClientTests extends QueueServiceClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueServiceAsyncClientTests.class);
-
-    private QueueServiceAsyncClient serviceClient;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildAsyncClient(), true, logger);
-        } else {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildAsyncClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        serviceClient.listQueues(new QueuesSegmentOptions().prefix(queueName))
-            .collectList()
-            .block()
-            .forEach(queue -> {
-                QueueAsyncClient client = serviceClient.getQueueAsyncClient(queue.name());
-                try {
-                    client.clearMessages().then(client.delete()).block();
-                } catch (StorageErrorException ex) {
-                    // Queue already delete, that's what we wanted anyways.
-                }
-            });
-    }
-
-    @Override
-    public void getQueueDoesNotCreateAQueue() {
-        StepVerifier.create(serviceClient.getQueueAsyncClient(queueName).enqueueMessage("Expecting an exception"));
-    }
-
-    @Override
-    public void createQueue() {
-        StepVerifier.create(serviceClient.createQueue(queueName).block().value().enqueueMessage("Testing service client creating a queue"))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-    }
-
-    @Override
-    public void createQueueWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-        QueueAsyncClient client = serviceClient.createQueue(queueName, metadata).block().value();
-
-        StepVerifier.create(client.getProperties())
-            .assertNext(response -> {
-                assertEquals(metadata, response.value().metadata());
-            })
-            .verifyComplete();
-    }
-
-    @Override
-    public void createQueueTwiceSameMetadata() {
-        final String messageText = "Testing service client creating the same queue twice does not modify the queue";
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        StepVerifier.create(serviceClient.createQueue(queueName, metadata).block().value().enqueueMessage(messageText))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 201))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.createQueue(queueName, metadata).block().value().peekMessages())
-            .assertNext(response -> assertEquals(messageText, response.messageText()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void createQueueTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        try {
-            serviceClient.createQueue(queueName);
-            serviceClient.createQueue(queueName, metadata);
-        } catch (Exception exception) {
-        }
-    }
-
-    @Override
-    public void deleteExistingQueue() {
-        QueueAsyncClient client = serviceClient.createQueue(queueName).block().value();
-        serviceClient.deleteQueue(queueName).block();
-
-        StepVerifier.create(client.enqueueMessage("Expecting an exception"));
-    }
-
-    @Override
-    public void deleteNonExistentQueue() {
-        try {
-            serviceClient.deleteQueue(queueName);
-        } catch (Exception exception) {
-        }
-    }
-
-    @Override
-    public void listQueues() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions()))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .verifyComplete();
-    }
-
-    @Override
-    public void listQueuesIncludeMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            if (i % 2 == 0) {
-                queue.metadata(metadata);
-            }
-
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions().includeMetadata(true)))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .verifyComplete();
-    }
-
-    @Override
-    public void listQueuesWithPrefix() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem();
-            if (i % 2 == 0) {
-                queue.name(queueName + "prefix" + i);
-                testQueues.add(queue);
-            } else {
-                queue.name(queueName + i);
-            }
-
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions().prefix(queueName + "prefix")))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .assertNext(result -> helper.assertQueuesAreEqual(testQueues.pop(), result))
-            .verifyComplete();
-    }
-
-    @Override
-    public void listQueuesWithLimit() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata()).block();
-        }
-
-        StepVerifier.create(serviceClient.listQueues(defaultSegmentOptions().maxResults(2)))
-            .assertNext(queueItem -> helper.assertQueuesAreEqual(queueItem, testQueues.pop()))
-            .assertNext(queueItem -> helper.assertQueuesAreEqual(queueItem, testQueues.pop()))
-            .assertNext(queueItem -> helper.assertQueuesAreEqual(queueItem, testQueues.pop()))
-            .verifyComplete();
-    }
-
-    @Override
-    public void setProperties() {
-        StorageServiceProperties originalProperties = serviceClient.getProperties().block().value();
-
-        RetentionPolicy retentionPolicy = new RetentionPolicy().enabled(true)
-            .days(3);
-
-        Logging logging = new Logging().version("1.0")
-            .delete(true)
-            .write(true)
-            .retentionPolicy(retentionPolicy);
-
-        Metrics metrics = new Metrics().enabled(true)
-            .includeAPIs(false)
-            .retentionPolicy(retentionPolicy)
-            .version("1.0");
-
-        StorageServiceProperties updatedProperties = new StorageServiceProperties().logging(logging)
-            .hourMetrics(metrics)
-            .minuteMetrics(metrics)
-            .cors(new ArrayList<>());
-
-        StepVerifier.create(serviceClient.setProperties(updatedProperties))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 202))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.getProperties())
-            .assertNext(response -> helper.assertQueueServicePropertiesAreEqual(updatedProperties, response.value()))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.setProperties(originalProperties))
-            .assertNext(response -> helper.assertResponseStatusCode(response, 202))
-            .verifyComplete();
-
-        StepVerifier.create(serviceClient.getProperties())
-            .assertNext(response -> helper.assertQueueServicePropertiesAreEqual(originalProperties, response.value()))
-            .verifyComplete();
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java
deleted file mode 100644
index 39e1b9d2beb4..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTests.java
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.http.rest.Response;
-import com.azure.core.http.rest.VoidResponse;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.EnqueuedMessage;
-import com.azure.storage.queue.models.Logging;
-import com.azure.storage.queue.models.Metrics;
-import com.azure.storage.queue.models.PeekedMessage;
-import com.azure.storage.queue.models.QueueItem;
-import com.azure.storage.queue.models.QueueProperties;
-import com.azure.storage.queue.models.QueuesSegmentOptions;
-import com.azure.storage.queue.models.RetentionPolicy;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.StorageServiceProperties;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-public class QueueServiceClientTests extends QueueServiceClientTestsBase {
-    private final ClientLogger logger = new ClientLogger(QueueServiceClientTests.class);
-
-    private QueueServiceClient serviceClient;
-
-    @Override
-    protected void beforeTest() {
-        queueName = getQueueName();
-        helper = new TestHelpers();
-
-        if (interceptorManager.isPlaybackMode()) {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(interceptorManager.getPlaybackClient())
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .buildClient(), true, logger);
-        } else {
-            serviceClient = helper.setupClient((connectionString, endpoint) -> new QueueServiceClientBuilder()
-                .connectionString(connectionString)
-                .httpClient(HttpClient.createDefault().wiretap(true))
-                .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
-                .addPolicy(interceptorManager.getRecordPolicy())
-                .buildClient(), false, logger);
-        }
-    }
-
-    @Override
-    protected void afterTest() {
-        serviceClient.listQueues(new QueuesSegmentOptions().prefix(queueName))
-            .forEach(queueToDelete -> {
-                try {
-                    QueueClient client = serviceClient.getQueueClient(queueToDelete.name());
-                    client.clearMessages();
-                    client.delete();
-                } catch (StorageErrorException ex) {
-                    // Queue already delete, that's what we wanted anyways.
-                }
-            });
-    }
-
-    @Override
-    public void getQueueDoesNotCreateAQueue() {
-        try {
-            serviceClient.getQueueClient(queueName).enqueueMessage("Expecting an exception");
-            fail("getQueueClient doesn't create a queue in Azure Storage.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void createQueue() {
-        QueueClient client = serviceClient.createQueue(queueName).value();
-        Response<EnqueuedMessage> response = client.enqueueMessage("Testing service client creating a queue");
-        helper.assertResponseStatusCode(response, 201);
-    }
-
-    @Override
-    public void createQueueWithMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-        QueueClient client = serviceClient.createQueue(queueName, metadata).value();
-
-        Response<QueueProperties> propertiesResponse = client.getProperties();
-        helper.assertResponseStatusCode(propertiesResponse, 200);
-        assertEquals(metadata, propertiesResponse.value().metadata());
-    }
-
-    @Override
-    public void createQueueTwiceSameMetadata() {
-        final String messageText = "Testing service client creating the same queue twice does not modify the queue";
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        EnqueuedMessage enqueuedMessage = serviceClient.createQueue(queueName, metadata).value().enqueueMessage(messageText).value();
-        assertNotNull(enqueuedMessage);
-
-        PeekedMessage peekedMessage = serviceClient.createQueue(queueName, metadata).value().peekMessages().iterator().next();
-        assertEquals(messageText, peekedMessage.messageText());
-    }
-
-    @Override
-    public void createQueueTwiceDifferentMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        try {
-            serviceClient.createQueue(queueName);
-            serviceClient.createQueue(queueName, metadata);
-            fail("Creating a queue twice with different metadata should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 409);
-        }
-    }
-
-    @Override
-    public void deleteExistingQueue() {
-        QueueClient client = serviceClient.createQueue(queueName).value();
-        serviceClient.deleteQueue(queueName);
-
-        try {
-            client.enqueueMessage("Expecting an exception");
-            fail("Attempting to enqueue a message on a client that has been delete should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void deleteNonExistentQueue() {
-        try {
-            serviceClient.deleteQueue(queueName);
-            fail("Attempting to delete a queue that doesn't exist should throw an exception.");
-        } catch (Exception exception) {
-            helper.assertExceptionStatusCode(exception, 404);
-        }
-    }
-
-    @Override
-    public void listQueues() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions())) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void listQueuesIncludeMetadata() {
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("metadata1", "value1");
-        metadata.put("metadata2", "value2");
-
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            if (i % 2 == 0) {
-                queue.metadata(metadata);
-            }
-
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions().includeMetadata(true))) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void listQueuesWithPrefix() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem();
-            if (i % 2 == 0) {
-                queue.name(queueName + "prefix" + i);
-                testQueues.add(queue);
-            } else {
-                queue.name(queueName + i);
-            }
-
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions().prefix(queueName + "prefix"))) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void listQueuesWithLimit() {
-        LinkedList<QueueItem> testQueues = new LinkedList<>();
-        for (int i = 0; i < 3; i++) {
-            QueueItem queue = new QueueItem().name(queueName + i);
-            testQueues.add(queue);
-            serviceClient.createQueue(queue.name(), queue.metadata());
-        }
-
-        for (QueueItem queue : serviceClient.listQueues(defaultSegmentOptions().maxResults(2))) {
-            helper.assertQueuesAreEqual(testQueues.pop(), queue);
-        }
-    }
-
-    @Override
-    public void setProperties() {
-        StorageServiceProperties originalProperties = serviceClient.getProperties().value();
-
-        RetentionPolicy retentionPolicy = new RetentionPolicy().enabled(true)
-            .days(3);
-
-        Logging logging = new Logging().version("1.0")
-            .delete(true)
-            .write(true)
-            .retentionPolicy(retentionPolicy);
-
-        Metrics metrics = new Metrics().enabled(true)
-            .includeAPIs(false)
-            .retentionPolicy(retentionPolicy)
-            .version("1.0");
-
-        StorageServiceProperties updatedProperties = new StorageServiceProperties().logging(logging)
-            .hourMetrics(metrics)
-            .minuteMetrics(metrics)
-            .cors(new ArrayList<>());
-
-        VoidResponse setResponse = serviceClient.setProperties(updatedProperties);
-        helper.assertResponseStatusCode(setResponse, 202);
-
-        Response<StorageServiceProperties> getResponse = serviceClient.getProperties();
-        helper.assertQueueServicePropertiesAreEqual(updatedProperties, getResponse.value());
-
-        setResponse = serviceClient.setProperties(originalProperties);
-        helper.assertResponseStatusCode(setResponse, 202);
-
-        getResponse = serviceClient.getProperties();
-        helper.assertQueueServicePropertiesAreEqual(originalProperties, getResponse.value());
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java
deleted file mode 100644
index f090814fbfc9..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueServiceClientTestsBase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.test.TestBase;
-import com.azure.storage.queue.models.QueuesSegmentOptions;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-public abstract class QueueServiceClientTestsBase extends TestBase {
-    String queueName;
-    TestHelpers helper;
-
-    @Rule
-    public TestName testName = new TestName();
-
-    @Override
-    public String testName() {
-        return testName.getMethodName();
-    }
-
-    String getQueueName() {
-        return testResourceNamer.randomName("queue", 16).toLowerCase();
-    }
-
-    @Test
-    public abstract void getQueueDoesNotCreateAQueue();
-
-    @Test
-    public abstract void createQueue();
-
-    @Test
-    public abstract void createQueueWithMetadata();
-
-    @Test
-    public abstract void createQueueTwiceSameMetadata();
-
-    @Test
-    public abstract void createQueueTwiceDifferentMetadata();
-
-    @Test
-    public abstract void deleteExistingQueue();
-
-    @Test
-    public abstract void deleteNonExistentQueue();
-
-    @Test
-    public abstract void listQueues();
-
-    @Test
-    public abstract void listQueuesIncludeMetadata();
-
-    @Test
-    public abstract void listQueuesWithPrefix();
-
-    @Test
-    public abstract void listQueuesWithLimit();
-
-    @Test
-    public abstract void setProperties();
-
-    QueuesSegmentOptions defaultSegmentOptions() {
-        return new QueuesSegmentOptions().prefix(queueName);
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/TestHelpers.java b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/TestHelpers.java
deleted file mode 100644
index 48639715112f..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/TestHelpers.java
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.azure.storage.queue;
-
-import com.azure.core.http.rest.Response;
-import com.azure.core.implementation.util.ImplUtils;
-import com.azure.core.util.configuration.ConfigurationManager;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.storage.queue.models.CorsRule;
-import com.azure.storage.queue.models.Logging;
-import com.azure.storage.queue.models.Metrics;
-import com.azure.storage.queue.models.QueueItem;
-import com.azure.storage.queue.models.RetentionPolicy;
-import com.azure.storage.queue.models.SignedIdentifier;
-import com.azure.storage.queue.models.StorageErrorException;
-import com.azure.storage.queue.models.StorageServiceProperties;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.function.BiFunction;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * Contains helper methods for unit tests.
- */
-class TestHelpers {
-    private final String azureStorageConnectionString = "AZURE_STORAGE_CONNECTION_STRING";
-    private final String azureStorageQueueEndpoint = "AZURE_STORAGE_QUEUE_ENDPOINT";
-
-    <T> T setupClient(BiFunction<String, String, T> clientBuilder, boolean isPlaybackMode, ClientLogger logger) {
-        String connectionString = "DefaultEndpointsProtocol=https;AccountName=teststorage;AccountKey=atestaccountkey;EndpointSuffix=core.windows.net";
-        String queueEndpoint = "https://teststorage.queue.core.windows.net/";
-
-        if (!isPlaybackMode) {
-            connectionString = ConfigurationManager.getConfiguration().get(azureStorageConnectionString);
-            queueEndpoint = ConfigurationManager.getConfiguration().get(azureStorageQueueEndpoint);
-        }
-
-        if (ImplUtils.isNullOrEmpty(connectionString) && ImplUtils.isNullOrEmpty(queueEndpoint)) {
-            logger.warning("{} and {} must be set to build the testing client", azureStorageConnectionString, azureStorageQueueEndpoint);
-            fail();
-            return null;
-        }
-
-        return clientBuilder.apply(connectionString, queueEndpoint);
-    }
-
-    void assertQueuesAreEqual(QueueItem expected, QueueItem actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.name(), actual.name());
-
-            if (expected.metadata() != null && !ImplUtils.isNullOrEmpty(actual.metadata())) {
-                assertEquals(expected.metadata(), actual.metadata());
-            }
-        }
-    }
-
-    void assertQueueServicePropertiesAreEqual(StorageServiceProperties expected, StorageServiceProperties actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertMetricsAreEqual(expected.hourMetrics(), actual.hourMetrics());
-            assertMetricsAreEqual(expected.minuteMetrics(), actual.minuteMetrics());
-            assertLoggingAreEqual(expected.logging(), actual.logging());
-            assertCorsAreEqual(expected.cors(), actual.cors());
-        }
-    }
-
-    private void assertMetricsAreEqual(Metrics expected, Metrics actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.enabled(), actual.enabled());
-            assertEquals(expected.includeAPIs(), actual.includeAPIs());
-            assertEquals(expected.version(), actual.version());
-            assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy());
-        }
-    }
-
-    private void assertLoggingAreEqual(Logging expected, Logging actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.read(), actual.read());
-            assertEquals(expected.write(), actual.write());
-            assertEquals(expected.delete(), actual.delete());
-            assertEquals(expected.version(), actual.version());
-            assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy());
-        }
-    }
-
-    private void assertRetentionPoliciesAreEqual(RetentionPolicy expected, RetentionPolicy actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.days(), actual.days());
-            assertEquals(expected.enabled(), actual.enabled());
-        }
-    }
-
-    private void assertCorsAreEqual(List<CorsRule> expected, List<CorsRule> actual) {
-        if (expected == null) {
-            assertTrue(ImplUtils.isNullOrEmpty(actual));
-        } else {
-            assertEquals(expected.size(), actual.size());
-            for (int i = 0; i < expected.size(); i++) {
-                assertCorRulesAreEqual(expected.get(i), actual.get(i));
-            }
-        }
-    }
-
-    private void assertCorRulesAreEqual(CorsRule expected, CorsRule actual) {
-        if (expected == null) {
-            assertNull(actual);
-        } else {
-            assertEquals(expected.allowedHeaders(), actual.allowedHeaders());
-            assertEquals(expected.allowedMethods(), actual.allowedMethods());
-            assertEquals(expected.allowedOrigins(), actual.allowedOrigins());
-            assertEquals(expected.exposedHeaders(), actual.exposedHeaders());
-            assertEquals(expected.maxAgeInSeconds(), actual.maxAgeInSeconds());
-        }
-    }
-
-    void assertPermissionsAreEqual(SignedIdentifier expected, SignedIdentifier actual) {
-        assertEquals(expected.id(), actual.id());
-        assertEquals(expected.accessPolicy().permission(), actual.accessPolicy().permission());
-        assertEquals(expected.accessPolicy().start(), actual.accessPolicy().start());
-        assertEquals(expected.accessPolicy().expiry(), actual.accessPolicy().expiry());
-    }
-
-    void assertResponseStatusCode(Response<?> response, int expectedStatusCode) {
-        assertEquals(expectedStatusCode, response.statusCode());
-    }
-
-    void assertExceptionStatusCode(Throwable throwable, int expectedStatusCode) {
-        assertTrue(throwable instanceof StorageErrorException);
-        StorageErrorException storageErrorException = (StorageErrorException) throwable;
-        assertEquals(expectedStatusCode, storageErrorException.response().statusCode());
-    }
-
-    void sleepInRecordMode(Duration duration) {
-        String azureTestMode = ConfigurationManager.getConfiguration().get("AZURE_TEST_MODE");
-        if ("RECORD".equalsIgnoreCase(azureTestMode)) {
-            sleep(duration);
-        }
-    }
-
-    void sleep(Duration duration) {
-        try {
-            Thread.sleep(duration.toMillis());
-        } catch (InterruptedException ex) {
-            // Ignore the error
-        }
-    }
-}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/APISpec.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/APISpec.groovy
new file mode 100644
index 000000000000..51618c5a2a74
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/APISpec.groovy
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.core.test.InterceptorManager
+import com.azure.core.test.TestMode
+import com.azure.core.test.utils.TestResourceNamer
+import com.azure.core.util.configuration.ConfigurationManager
+import com.azure.core.util.logging.ClientLogger
+import com.azure.storage.queue.QueueClientBuilder
+import com.azure.storage.queue.QueueServiceClient
+import com.azure.storage.queue.QueueServiceClientBuilder
+import com.azure.storage.queue.models.QueuesSegmentOptions
+import spock.lang.Specification
+
+class APISpec extends Specification {
+    // Field common used for all APIs.
+    def logger = new ClientLogger(APISpec.class)
+    def AZURE_TEST_MODE = "AZURE_TEST_MODE"
+    def interceptorManager
+    def testResourceName
+
+    // Clients for API tests
+    def primaryQueueServiceClient
+    def primaryQueueServiceAsyncClient
+
+
+    // Test name for test method name.
+    def methodName
+    def testMode = getTestMode()
+    def connectionString = ConfigurationManager.getConfiguration().get("AZURE_STORAGE_QUEUE_CONNECTION_STRING")
+
+    /**
+     * Setup the QueueServiceClient and QueueClient common used for the API tests.
+     */
+    def setup() {
+        String testName = refactorName(specificationContext.currentIteration.getName())
+        String className = specificationContext.getCurrentSpec().getName()
+        methodName = className + testName
+        logger.info("Test Mode: {}, Name: {}", testMode, methodName)
+        interceptorManager = new InterceptorManager(methodName, testMode)
+        testResourceName = new TestResourceNamer(methodName, testMode,
+            interceptorManager.getRecordedData())
+    }
+
+    /**
+     * Clean up the test queues and messages for the account.
+     */
+    def cleanup() {
+
+        interceptorManager.close()
+        if (getTestMode() == TestMode.RECORD) {
+            QueueServiceClient cleanupQueueServiceClient = new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .buildClient()
+            cleanupQueueServiceClient.listQueues(new QueuesSegmentOptions().prefix(methodName.toLowerCase())).each {
+                queueItem -> cleanupQueueServiceClient.deleteQueue(queueItem.name())
+            }
+        }
+    }
+
+    /**
+     * Test mode is initialized whenever test is executed. Helper method which is used to determine what to do under
+     * certain test mode.
+     * @return The TestMode:
+     * <ul>
+     *     <li>Playback: (default if no test mode setup)</li>
+     * </ul>
+     */
+    def getTestMode() {
+        def azureTestMode = ConfigurationManager.getConfiguration().get(AZURE_TEST_MODE)
+
+        if (azureTestMode != null) {
+            try {
+                return TestMode.valueOf(azureTestMode.toUpperCase(Locale.US))
+            } catch (IllegalArgumentException e) {
+                logger.error("Could not parse '{}' into TestEnum. Using 'Playback' mode.", azureTestMode)
+                return TestMode.PLAYBACK
+            }
+        }
+
+        logger.info("Environment variable '{}' has not been set yet. Using 'Playback' mode.", AZURE_TEST_MODE)
+        return TestMode.PLAYBACK
+    }
+
+    def queueServiceBuilderHelper(final InterceptorManager interceptorManager) {
+        if (testMode == TestMode.RECORD) {
+            return new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .addPolicy(interceptorManager.getRecordPolicy())
+        } else {
+            return new QueueServiceClientBuilder()
+                .connectionString(connectionString)
+                .httpClient(interceptorManager.getPlaybackClient())
+        }
+    }
+
+    def queueBuilderHelper(final InterceptorManager interceptorManager) {
+        def queueName = testResourceName.randomName("queue", 16)
+        if (testMode == TestMode.RECORD) {
+            return new QueueClientBuilder()
+                .connectionString(connectionString)
+                .queueName(queueName)
+                .addPolicy(interceptorManager.getRecordPolicy())
+        } else {
+            return new QueueClientBuilder()
+                .connectionString(connectionString)
+                .queueName(queueName)
+                .httpClient(interceptorManager.getPlaybackClient())
+        }
+    }
+
+    private def refactorName(String text) {
+        def fullName = text.split(" ").collect { it.capitalize() }.join("")
+        def matcher = (fullName =~ /(.*)(\[)(.*)(\])/)
+
+        if (!matcher.find()) {
+            return fullName
+        }
+        return matcher[0][1] + matcher[0][3]
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAPITests.groovy
new file mode 100644
index 000000000000..46b52436bf4c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAPITests.groovy
@@ -0,0 +1,446 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+
+import com.azure.storage.queue.models.AccessPolicy
+import com.azure.storage.queue.models.SignedIdentifier
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageErrorException
+import reactor.test.StepVerifier
+import spock.lang.Ignore
+import spock.lang.Unroll
+
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
+class QueueAPITests extends APISpec {
+    def queueClient
+
+    static def testMetadata = Collections.singletonMap("metadata", "value")
+    static def createMetadata = Collections.singletonMap("metadata1", "value")
+
+    def setup() {
+        primaryQueueServiceClient = queueServiceBuilderHelper(interceptorManager).buildClient()
+        queueClient = primaryQueueServiceClient.getQueueClient(testResourceName.randomName(methodName, 60))
+    }
+
+    def "Create queue with shared key"() {
+        expect:
+        QueueTestHelper.assertResponseStatusCode(queueClient.create(), 201)
+    }
+
+    // TODO: Will implement the test after introduce the sas token generator
+    @Ignore
+    def "Create queue with sas token"() {
+
+    }
+
+    def "Delete exist queue"() {
+        given:
+        queueClient.create()
+        when:
+        def deleteQueueResponse = queueClient.delete()
+        then:
+        QueueTestHelper.assertResponseStatusCode(deleteQueueResponse, 204)
+
+    }
+
+    def "Delete queue error"() {
+        when:
+        queueClient.delete()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Get properties"() {
+        given:
+        queueClient.create(testMetadata)
+        when:
+        def getPropertiesResponse = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponse, 200)
+        getPropertiesResponse.value().approximateMessagesCount() == 0
+        testMetadata.equals(getPropertiesResponse.value().metadata())
+    }
+
+    def "Get properties error"() {
+        when:
+        queueClient.getProperties()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    @Unroll
+    def "Set and clear metadata"() {
+        given:
+        queueClient.create(matadataInCreate)
+        when:
+        def getPropertiesResponseBefore = queueClient.getProperties()
+        def setMetadataResponse = queueClient.setMetadata(metadataInSet)
+        def getPropertiesResponseAfter = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponseBefore, 200)
+        expectMetadataInCreate.equals(getPropertiesResponseBefore.value().metadata())
+        QueueTestHelper.assertResponseStatusCode(setMetadataResponse, 204)
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponseAfter, 200)
+        expectMetadataInSet.equals(getPropertiesResponseAfter.value().metadata)
+        where:
+        matadataInCreate | metadataInSet | expectMetadataInCreate | expectMetadataInSet
+        null             | testMetadata  | Collections.emptyMap() | testMetadata
+        createMetadata   | testMetadata  | createMetadata         | testMetadata
+        createMetadata   | null          | createMetadata         | Collections.emptyMap()
+        testMetadata     | testMetadata  | testMetadata           | testMetadata
+        null             | null          | Collections.emptyMap() | Collections.emptyMap()
+    }
+
+    def "Set metadata queue error"() {
+        when:
+        queueClient.setMetadata(testMetadata)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    @Unroll
+    def "Set invalid meta"() {
+        given:
+        def invalidMetadata = Collections.singletonMap(invalidKey, "value")
+        queueClient.create()
+        when:
+        queueClient.setMetadata(invalidMetadata)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMessage)
+        where:
+        invalidKey     | statusCode | errMessage
+        "invalidMeta"  | 403        | StorageErrorCode.AUTHENTICATION_ERROR
+        "invalid-meta" | 400        | StorageErrorCode.INVALID_METADATA
+        "12345"        | 400        | StorageErrorCode.INVALID_METADATA
+        ""             | 400        | StorageErrorCode.EMPTY_METADATA_KEY
+    }
+
+    def "Get access policy"() {
+        given:
+        queueClient.create()
+        when:
+        def accessPolicies = queueClient.getAccessPolicy()
+        then:
+        !accessPolicies.iterator().hasNext()
+    }
+
+    def "Get access policy error"() {
+        when:
+        queueClient.getAccessPolicy().iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Set access policy"() {
+        given:
+        queueClient.create()
+        def accessPolicy = new AccessPolicy()
+            .permission("raup")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+        def permission = new SignedIdentifier()
+            .id("testpermission")
+            .accessPolicy(accessPolicy)
+        when:
+        def setAccessPolicyResponse = queueClient.setAccessPolicy(Collections.singletonList(permission))
+        def nextAccessPolicy = queueClient.getAccessPolicy().iterator().next()
+        then:
+        QueueTestHelper.assertResponseStatusCode(setAccessPolicyResponse, 204)
+        QueueTestHelper.assertPermissionsAreEqual(permission, nextAccessPolicy)
+    }
+
+    def "Set invalid access policy"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permission = new SignedIdentifier()
+            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
+            .accessPolicy(accessPolicy)
+        queueClient.create()
+        when:
+        queueClient.setAccessPolicy(Collections.singletonList(permission))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+    }
+
+    def "Set multiple access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 3; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueClient.create()
+        when:
+        def setAccessPolicyResponse = queueClient.setAccessPolicy(permissions)
+        def nextAccessPolicy = queueClient.getAccessPolicy().iterator()
+        then:
+        QueueTestHelper.assertResponseStatusCode(setAccessPolicyResponse, 204)
+        QueueTestHelper.assertPermissionsAreEqual(permissions[0], nextAccessPolicy.next())
+        QueueTestHelper.assertPermissionsAreEqual(permissions[1], nextAccessPolicy.next())
+        QueueTestHelper.assertPermissionsAreEqual(permissions[2], nextAccessPolicy.next())
+        !nextAccessPolicy.hasNext()
+    }
+
+    def "Set too many access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 6; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueClient.create()
+        when:
+        queueClient.setAccessPolicy(permissions)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+    }
+
+    def "Enqueue message"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        when:
+        def enqueueMsgResponse = queueClient.enqueueMessage(expectMsg)
+        def peekMsgIter = queueClient.peekMessages().iterator()
+        then:
+        QueueTestHelper.assertResponseStatusCode(enqueueMsgResponse, 201)
+        expectMsg.equals(peekMsgIter.next().messageText())
+        !peekMsgIter.hasNext()
+    }
+
+    def "Enqueue empty message"() {
+        given:
+        queueClient.create()
+        def expectMsg = ""
+        when:
+        def enqueueMsgResponse = queueClient.enqueueMessage(expectMsg)
+        def peekMsgIter = queueClient.peekMessages().iterator()
+        then:
+        QueueTestHelper.assertResponseStatusCode(enqueueMsgResponse, 201)
+        peekMsgIter.next().messageText() == null
+        !peekMsgIter.hasNext()
+    }
+
+    def "Enqueue time to live"() {
+        given:
+        queueClient.create()
+        when:
+        def enqueueMsgResponse = queueClient.enqueueMessage("test message",
+            Duration.ofSeconds(0), Duration.ofSeconds(2))
+        then:
+        QueueTestHelper.assertResponseStatusCode(enqueueMsgResponse, 201)
+    }
+
+    def "Dequeue message"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        queueClient.enqueueMessage(expectMsg)
+        when:
+        def dequeueMsgResponse = queueClient.dequeueMessages().iterator().next()
+        then:
+        expectMsg.equals(dequeueMsgResponse.messageText())
+    }
+
+    def "Dequeue multiple messages"() {
+        given:
+        queueClient.create()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueClient.enqueueMessage(expectMsg1)
+        queueClient.enqueueMessage(expectMsg2)
+        when:
+        def dequeueMsgIter = queueClient.dequeueMessages(2).iterator()
+        then:
+        expectMsg1.equals(dequeueMsgIter.next().messageText())
+        expectMsg2.equals(dequeueMsgIter.next().messageText())
+    }
+
+    def "Dequeue too many message"() {
+        given:
+        queueClient.create()
+        when:
+        queueClient.dequeueMessages(33).iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+    }
+
+    def "Peek message"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        queueClient.enqueueMessage(expectMsg)
+        when:
+        def peekMsgIter = queueClient.peekMessages().iterator().next()
+        then:
+        expectMsg.equals(peekMsgIter.messageText())
+    }
+
+    def "Peek multiple messages"() {
+        given:
+        queueClient.create()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueClient.enqueueMessage(expectMsg1)
+        queueClient.enqueueMessage(expectMsg2)
+        when:
+        def peekMsgIter = queueClient.peekMessages(2).iterator()
+        then:
+        expectMsg1.equals(peekMsgIter.next().messageText())
+        expectMsg2.equals(peekMsgIter.next().messageText())
+        !peekMsgIter.hasNext()
+    }
+
+    def "Peek too many message"() {
+        given:
+        queueClient.create()
+        when:
+        queueClient.peekMessages(33).iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+    }
+
+    def "Peek messages error"() {
+        when:
+        queueClient.peekMessages().iterator().next()
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Clear messages"() {
+        given:
+        queueClient.create()
+        queueClient.enqueueMessage("test message 1")
+        queueClient.enqueueMessage("test message 2")
+        queueClient.enqueueMessage("test message 3")
+        when:
+        def getPropertiesResponse = queueClient.getProperties()
+        def clearMsgResponse = queueClient.clearMessages()
+        def getPropertiesAfterResponse = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponse, 200)
+        getPropertiesResponse.value().approximateMessagesCount() == 3
+        QueueTestHelper.assertResponseStatusCode(clearMsgResponse, 204)
+        QueueTestHelper.assertResponseStatusCode(getPropertiesAfterResponse, 200)
+        getPropertiesAfterResponse.value().approximateMessagesCount() == 0
+    }
+
+    def "Clear messages error"() {
+        when:
+        StepVerifier.create(queueClient.clearMessages())
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Delete message"() {
+        given:
+        queueClient.create()
+        queueClient.enqueueMessage("test message 1")
+        queueClient.enqueueMessage("test message 2")
+        queueClient.enqueueMessage("test message 3")
+        def dequeueMsg = queueClient.dequeueMessages().iterator().next()
+        when:
+        def getPropertiesResponse = queueClient.getProperties()
+        def deleteMsgResponse = queueClient.deleteMessage(dequeueMsg.messageId(), dequeueMsg.popReceipt())
+        def getPropertiesAfterResponse = queueClient.getProperties()
+        then:
+        QueueTestHelper.assertResponseStatusCode(getPropertiesResponse, 200)
+        getPropertiesResponse.value().approximateMessagesCount() == 3
+        QueueTestHelper.assertResponseStatusCode(deleteMsgResponse, 204)
+        QueueTestHelper.assertResponseStatusCode(getPropertiesAfterResponse, 200)
+        getPropertiesAfterResponse.value().approximateMessagesCount() == 2
+    }
+
+    @Unroll
+    def "Delete message invalid args"() {
+        given:
+        queueClient.create()
+        def expectMsg = "test message"
+        queueClient.enqueueMessage(expectMsg)
+        def dequeueMessageIter = queueClient.dequeueMessages().iterator().next()
+        when:
+        def deleteMessageId = messageId ? dequeueMessageIter.messageId() : dequeueMessageIter.messageId() + "Random"
+        def deletePopReceipt = popReceipt ? dequeueMessageIter.popReceipt() : dequeueMessageIter.popReceipt() + "Random"
+        queueClient.deleteMessage(deleteMessageId, deletePopReceipt)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMsg)
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+    def "Update message"() {
+        given:
+        def updateMsg = "Updated test message"
+        queueClient.create()
+        queueClient.enqueueMessage("test message before update")
+
+        def dequeueMsg = queueClient.dequeueMessages().iterator().next()
+        when:
+        def updateMsgResponse = queueClient.updateMessage(updateMsg,
+            dequeueMsg.messageId(), dequeueMsg.popReceipt(), Duration.ofSeconds(1))
+        QueueTestHelper.sleepInRecord(Duration.ofSeconds(2))
+        def peekMsgIter = queueClient.peekMessages().iterator().next()
+        then:
+        QueueTestHelper.assertResponseStatusCode(updateMsgResponse, 204)
+        updateMsg.equals(peekMsgIter.messageText())
+    }
+
+    @Unroll
+    def "Update message invalid args"() {
+        given:
+        queueClient.create()
+        def updateMsg = "Updated test message"
+        queueClient.enqueueMessage("test message before update")
+        def dequeueMessageIter = queueClient.dequeueMessages().iterator().next()
+        when:
+        def updateMessageId = messageId ? dequeueMessageIter.messageId() : dequeueMessageIter.messageId() + "Random"
+        def updatePopReceipt = popReceipt ? dequeueMessageIter.popReceipt() : dequeueMessageIter.popReceipt() + "Random"
+        queueClient.updateMessage(updateMsg, updateMessageId, updatePopReceipt, Duration.ofSeconds(1))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMsg)
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAysncAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAysncAPITests.groovy
new file mode 100644
index 000000000000..653016c3b0a7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueAysncAPITests.groovy
@@ -0,0 +1,511 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.storage.queue.models.AccessPolicy
+import com.azure.storage.queue.models.SignedIdentifier
+import com.azure.storage.queue.models.StorageErrorCode
+import reactor.test.StepVerifier
+import spock.lang.Ignore
+import spock.lang.Unroll
+
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
+class QueueAysncAPITests extends APISpec {
+    def queueAsyncClient
+
+    static def testMetadata = Collections.singletonMap("metadata", "value")
+    static def createMetadata = Collections.singletonMap("metadata1", "value")
+
+    def setup() {
+        primaryQueueServiceAsyncClient = queueServiceBuilderHelper(interceptorManager).buildAsyncClient()
+        queueAsyncClient = primaryQueueServiceAsyncClient.getQueueAsyncClient(testResourceName.randomName(methodName, 60))
+    }
+
+    def "Create queue with shared key"() {
+        expect:
+        StepVerifier.create(queueAsyncClient.create()).assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201) }
+            .verifyComplete()
+    }
+
+    // TODO: Will implement the test after introduce the sas token generator
+    @Ignore
+    def "Create queue with sas token"() {
+
+    }
+
+    def "Delete exist queue"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def deleteQueueVerifier = StepVerifier.create(queueAsyncClient.delete())
+        then:
+        deleteQueueVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204) }
+            .verifyComplete()
+    }
+
+    def "Delete queue error"() {
+        when:
+        def deleteQueueVerifier = StepVerifier.create(queueAsyncClient.delete())
+        then:
+        deleteQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Get properties"() {
+        given:
+        queueAsyncClient.create(testMetadata).block()
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 0
+            assert testMetadata.equals(it.value().metadata())
+        }.verifyComplete()
+    }
+
+    def "Get properties error"() {
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    @Unroll
+    def "Set and clear metadata"() {
+        given:
+        queueAsyncClient.create(matadataInCreate).block()
+        when:
+        def getPropertiesVerifierBefore = StepVerifier.create(queueAsyncClient.getProperties())
+        def setMetadataVerifier = StepVerifier.create(queueAsyncClient.setMetadata(metadataInSet))
+        def getPropertiesVerifierAfter = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifierBefore.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert expectMetadataInCreate.equals(it.value().metadata())
+        }.verifyComplete()
+        setMetadataVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204) }
+            .verifyComplete()
+        getPropertiesVerifierAfter.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert expectMetadataInSet.equals(it.value().metadata)
+        }.verifyComplete()
+        where:
+        matadataInCreate | metadataInSet | expectMetadataInCreate | expectMetadataInSet
+        null             | testMetadata  | Collections.emptyMap() | testMetadata
+        createMetadata   | testMetadata  | createMetadata         | testMetadata
+        createMetadata   | null          | createMetadata         | Collections.emptyMap()
+        testMetadata     | testMetadata  | testMetadata           | testMetadata
+        null             | null          | Collections.emptyMap() | Collections.emptyMap()
+    }
+
+    def "Set metadata queue error"() {
+        when:
+        def setMetadataVerifier = StepVerifier.create(queueAsyncClient.setMetadata(testMetadata))
+        then:
+        setMetadataVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    @Unroll
+    def "Set invalid meta"() {
+        given:
+        def invalidMetadata = Collections.singletonMap(invalidKey, "value")
+        queueAsyncClient.create().block()
+        when:
+        def setMetadataVerifier = StepVerifier.create(queueAsyncClient.setMetadata(invalidMetadata))
+        then:
+        setMetadataVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMessage)
+        }
+        where:
+        invalidKey     | statusCode | errMessage
+        "invalidMeta"  | 403        | StorageErrorCode.AUTHENTICATION_ERROR
+        "invalid-meta" | 400        | StorageErrorCode.INVALID_METADATA
+        "12345"        | 400        | StorageErrorCode.INVALID_METADATA
+        ""             | 400        | StorageErrorCode.EMPTY_METADATA_KEY
+    }
+
+    def "Get access policy"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        getAccessPolicyVerifier.verifyComplete()
+    }
+
+    def "Get access policy does error"() {
+        when:
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        getAccessPolicyVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Set access policy"() {
+        given:
+        queueAsyncClient.create().block()
+        def accessPolicy = new AccessPolicy()
+            .permission("raup")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+        def permission = new SignedIdentifier()
+            .id("testpermission")
+            .accessPolicy(accessPolicy)
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(Collections.singletonList(permission)))
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        setAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permission, it)
+        }.verifyComplete()
+    }
+
+    def "Set invalid access policy"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permission = new SignedIdentifier()
+            .id("theidofthispermissionislongerthanwhatisallowedbytheserviceandshouldfail")
+            .accessPolicy(accessPolicy)
+        queueAsyncClient.create().block()
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(Collections.singletonList(permission)))
+        then:
+        setAccessPolicyVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+        }
+    }
+
+    def "Set multiple access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 3; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueAsyncClient.create().block()
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(permissions))
+        def getAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.getAccessPolicy())
+        then:
+        setAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getAccessPolicyVerifier.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permissions[0], it)
+        }.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permissions[1], it)
+        }.assertNext {
+            assert QueueTestHelper.assertPermissionsAreEqual(permissions[2], it)
+        }.verifyComplete()
+    }
+
+    def "Set too many access policies"() {
+        given:
+        def accessPolicy = new AccessPolicy()
+            .permission("r")
+            .start(OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0), ZoneOffset.UTC))
+            .expiry(OffsetDateTime.of(LocalDateTime.of(2020, 1, 1, 0, 0), ZoneOffset.UTC))
+
+        def permissions = new ArrayList<>()
+        for (int i = 0; i < 6; i++) {
+            permissions.add(new SignedIdentifier()
+                .id("policy" + i)
+                .accessPolicy(accessPolicy))
+        }
+        queueAsyncClient.create().block()
+        when:
+        def setAccessPolicyVerifier = StepVerifier.create(queueAsyncClient.setAccessPolicy(permissions))
+        then:
+        setAccessPolicyVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.INVALID_XML_DOCUMENT)
+        }
+    }
+
+    def "Enqueue message"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        when:
+        def enqueueMsgVerifier = StepVerifier.create(queueAsyncClient.enqueueMessage(expectMsg))
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        enqueueMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        peekMsgVerifier.assertNext {
+            assert expectMsg.equals(it.messageText())
+            assert !it.hasNext()
+        }
+    }
+
+    def "Enqueue empty message"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def enqueueMsgVerifier = StepVerifier.create(queueAsyncClient.enqueueMessage(""))
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        enqueueMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        peekMsgVerifier.assertNext {
+            assert it.messageText() == null
+            assert !it.hasNext()
+        }
+    }
+
+    def "Enqueue time to live"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def enqueueMsgVerifier = StepVerifier.create(queueAsyncClient.enqueueMessage("test message",
+            Duration.ofSeconds(0), Duration.ofSeconds(2)))
+        then:
+        enqueueMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+    }
+
+    def "Dequeue message"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        queueAsyncClient.enqueueMessage(expectMsg).block()
+        when:
+        def dequeueMsgVerifier = StepVerifier.create(queueAsyncClient.dequeueMessages())
+        then:
+        dequeueMsgVerifier.assertNext {
+            assert expectMsg.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Dequeue multiple messages"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueAsyncClient.enqueueMessage(expectMsg1).block()
+        queueAsyncClient.enqueueMessage(expectMsg2).block()
+        when:
+        def dequeueMsgVerifier = StepVerifier.create(queueAsyncClient.dequeueMessages(2))
+        then:
+        dequeueMsgVerifier.assertNext {
+            assert expectMsg1.equals(it.messageText())
+        }.assertNext {
+            assert expectMsg2.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Dequeue too many message"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def dequeueMsgVerifier = StepVerifier.create(queueAsyncClient.dequeueMessages(33))
+        then:
+        dequeueMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+        }
+    }
+
+    def "Peek message"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        queueAsyncClient.enqueueMessage(expectMsg).block()
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        peekMsgVerifier.assertNext {
+            assert expectMsg.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Peek multiple messages"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg1 = "test message 1"
+        def expectMsg2 = "test message 2"
+        queueAsyncClient.enqueueMessage(expectMsg1).block()
+        queueAsyncClient.enqueueMessage(expectMsg2).block()
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages(2))
+        then:
+        peekMsgVerifier.assertNext {
+            assert expectMsg1.equals(it.messageText())
+        }.assertNext {
+            assert expectMsg2.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    def "Peek too many message"() {
+        given:
+        queueAsyncClient.create().block()
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages(33))
+        then:
+        peekMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.OUT_OF_RANGE_QUERY_PARAMETER_VALUE)
+        }
+    }
+
+    def "Peek messages error"() {
+        when:
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages())
+        then:
+        peekMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Clear messages"() {
+        given:
+        queueAsyncClient.create().block()
+        queueAsyncClient.enqueueMessage("test message 1").block()
+        queueAsyncClient.enqueueMessage("test message 2").block()
+        queueAsyncClient.enqueueMessage("test message 3").block()
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        def clearMsgVerifier = StepVerifier.create(queueAsyncClient.clearMessages())
+        def getPropertiesAfterVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 3
+        }.verifyComplete()
+        clearMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getPropertiesAfterVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 0
+        }.verifyComplete()
+    }
+
+    def "Clear messages error"() {
+        when:
+        def clearMsgVerifier = StepVerifier.create(queueAsyncClient.clearMessages())
+        then:
+        clearMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Delete message"() {
+        given:
+        queueAsyncClient.create().block()
+        queueAsyncClient.enqueueMessage("test message 1").block()
+        queueAsyncClient.enqueueMessage("test message 2").block()
+        queueAsyncClient.enqueueMessage("test message 3").block()
+        def dequeueMsg = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def getPropertiesVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        def deleteMsgVerifier = StepVerifier.create(queueAsyncClient.deleteMessage(dequeueMsg.messageId(), dequeueMsg.popReceipt()))
+        def getPropertiesAfterVerifier = StepVerifier.create(queueAsyncClient.getProperties())
+        then:
+        getPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 3
+
+        }.verifyComplete()
+        deleteMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        getPropertiesAfterVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 200)
+            assert it.value().approximateMessagesCount() == 2
+        }.verifyComplete()
+    }
+
+    @Unroll
+    def "Delete message invalid args"() {
+        given:
+        queueAsyncClient.create().block()
+        def expectMsg = "test message"
+        queueAsyncClient.enqueueMessage(expectMsg).block()
+        def dequeueMessage = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def deleteMessageId = messageId ? dequeueMessage.messageId() : dequeueMessage.messageId() + "Random"
+        def deletePopReceipt = popReceipt ? dequeueMessage.popReceipt() : dequeueMessage.popReceipt() + "Random"
+        def deleteMsgVerifier = StepVerifier.create(queueAsyncClient.deleteMessage(deleteMessageId, deletePopReceipt))
+        then:
+        deleteMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMsg)
+        }
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+    def "Update message"() {
+        given:
+        def updateMsg = "Updated test message"
+        queueAsyncClient.create().block()
+        queueAsyncClient.enqueueMessage("test message before update").block()
+
+        def dequeueMsg = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def updateMsgVerifier = StepVerifier.create(queueAsyncClient.updateMessage(updateMsg,
+            dequeueMsg.messageId(), dequeueMsg.popReceipt(), Duration.ofSeconds(1)))
+        def peekMsgVerifier = StepVerifier.create(queueAsyncClient.peekMessages().delaySubscription(Duration.ofSeconds(2)))
+        then:
+        updateMsgVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        peekMsgVerifier.assertNext {
+            assert updateMsg.equals(it.messageText())
+        }.verifyComplete()
+    }
+
+    @Unroll
+    def "Update message invalid args"() {
+        given:
+        queueAsyncClient.create().block()
+        def updateMsg = "Updated test message"
+        queueAsyncClient.enqueueMessage("test message before update").block()
+        def dequeueMessage = queueAsyncClient.dequeueMessages().blockFirst()
+        when:
+        def updateMessageId = messageId ? dequeueMessage.messageId() : dequeueMessage.messageId() + "Random"
+        def updatePopReceipt = popReceipt ? dequeueMessage.popReceipt() : dequeueMessage.popReceipt() + "Random"
+        def updateMsgVerifier = StepVerifier.create(queueAsyncClient.updateMessage(updateMsg, updateMessageId, updatePopReceipt, Duration.ofSeconds(1)))
+        then:
+        updateMsgVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMsg)
+        }
+        where:
+        messageId | popReceipt | statusCode | errMsg
+        true      | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+        false     | true       | 404        | StorageErrorCode.MESSAGE_NOT_FOUND
+        false     | false      | 400        | StorageErrorCode.INVALID_QUERY_PARAMETER_VALUE
+    }
+
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAPITests.groovy
new file mode 100644
index 000000000000..2cbcdeb7875e
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAPITests.groovy
@@ -0,0 +1,170 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.storage.queue.QueueClient
+import com.azure.storage.queue.models.Logging
+import com.azure.storage.queue.models.Metrics
+import com.azure.storage.queue.models.QueueItem
+import com.azure.storage.queue.models.QueuesSegmentOptions
+import com.azure.storage.queue.models.RetentionPolicy
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageErrorException
+import com.azure.storage.queue.models.StorageServiceProperties
+import spock.lang.Unroll
+
+class QueueServiceAPITests extends APISpec {
+
+    def setup() {
+        primaryQueueServiceClient = queueServiceBuilderHelper(interceptorManager).buildClient()
+    }
+
+    def "Get queue client"() {
+        given:
+        def queueClient = primaryQueueServiceClient.getQueueClient(testResourceName.randomName(methodName, 60))
+        expect:
+        queueClient instanceof QueueClient
+    }
+
+    def "Create queue"() {
+        when:
+        def queueClientResponse = primaryQueueServiceClient.createQueue(testResourceName.randomName(methodName, 60))
+        def enqueueMessageResponse = queueClientResponse.value().enqueueMessage("Testing service client creating a queue")
+        then:
+        QueueTestHelper.assertResponseStatusCode(queueClientResponse, 201)
+        QueueTestHelper.assertResponseStatusCode(enqueueMessageResponse, 201)
+    }
+
+    @Unroll
+    def "Create queue with invalid name"() {
+        when:
+        primaryQueueServiceClient.createQueue(queueName)
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMesage)
+        where:
+        queueName      | statusCode | errMesage
+        "a_b"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "-ab"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "a--b"         | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "Abc"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "ab"           | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+        "verylong" * 8 | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+    }
+
+    def "Create null"() {
+        when:
+        primaryQueueServiceClient.createQueue(null)
+        then:
+        thrown(NullPointerException)
+    }
+
+    @Unroll
+    def "Create queue maxOverload"() {
+        when:
+        def queueClientResponse = primaryQueueServiceClient.createQueue(testResourceName.randomName(methodName, 60), metadata)
+        def enqueueMessageResponse = queueClientResponse.value().enqueueMessage("Testing service client creating a queue")
+        then:
+        QueueTestHelper.assertResponseStatusCode(queueClientResponse, 201)
+        QueueTestHelper.assertResponseStatusCode(enqueueMessageResponse, 201)
+        where:
+        metadata                                       | _
+        null                                           | _
+        Collections.singletonMap("metadata", "value")  | _
+        Collections.singletonMap("metadata", "va@lue") | _
+    }
+
+    def "Create queue with invalid metadata"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 16)
+        when:
+        primaryQueueServiceClient.createQueue(queueName, Collections.singletonMap("meta@data", "value"))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 400, "Bad Request")
+    }
+
+    def "Delete queue"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        when:
+        def queueClient = primaryQueueServiceClient.createQueue(queueName).value()
+        def deleteQueueResponse = primaryQueueServiceClient.deleteQueue(queueName)
+        queueClient.enqueueMessage("Expecting exception as queue has been deleted.")
+        then:
+        QueueTestHelper.assertResponseStatusCode(deleteQueueResponse, 204)
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    def "Delete queue error"() {
+        when:
+        primaryQueueServiceClient.deleteQueue(testResourceName.randomName(methodName, 60))
+        then:
+        def e = thrown(StorageErrorException)
+        QueueTestHelper.assertExceptionStatusCodeAndMessage(e, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+    }
+
+    @Unroll
+    def "List queues"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        LinkedList<QueueItem> testQueues = new LinkedList<>()
+        for (int i = 0; i < 3; i++) {
+            String version = Integer.toString(i)
+            QueueItem queue = new QueueItem().name(queueName + version)
+                .metadata(Collections.singletonMap("metadata" + version, "value" + version))
+            testQueues.add(queue)
+            primaryQueueServiceClient.createQueue(queue.name(), queue.metadata())
+        }
+        when:
+        def queueListIter = primaryQueueServiceClient.listQueues(options)
+        then:
+        queueListIter.each {
+            QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+            primaryQueueServiceClient.deleteQueue(it.name())
+        }
+        testQueues.size() == 0
+        where:
+        options                                                                                   | _
+        new QueuesSegmentOptions().prefix("queueserviceapitestslistqueues")                       | _
+        new QueuesSegmentOptions().prefix("queueserviceapitestslistqueues").maxResults(2)         | _
+        new QueuesSegmentOptions().prefix("queueserviceapitestslistqueues").includeMetadata(true) | _
+    }
+
+    def "List empty queues"() {
+        when:
+        primaryQueueServiceClient.getQueueClient(testResourceName.randomName(methodName, 60))
+        then:
+        !primaryQueueServiceClient.listQueues(new QueuesSegmentOptions().prefix(methodName)).iterator().hasNext()
+    }
+
+    def "Get and set properties"() {
+        given:
+        def originalProperties = primaryQueueServiceClient.getProperties().value()
+        def retentionPolicy = new RetentionPolicy().enabled(true)
+            .days(3)
+        def logging = new Logging().version("1.0")
+            .delete(true)
+            .write(true)
+            .retentionPolicy(retentionPolicy)
+        def metrics = new Metrics().enabled(true)
+            .includeAPIs(false)
+            .retentionPolicy(retentionPolicy)
+            .version("1.0")
+        def updatedProperties = new StorageServiceProperties().logging(logging)
+            .hourMetrics(metrics)
+            .minuteMetrics(metrics)
+            .cors(new ArrayList<>())
+
+        when:
+        def getResponseBefore = primaryQueueServiceClient.getProperties()
+        def setResponse = primaryQueueServiceClient.setProperties(updatedProperties)
+        def getResponseAfter = primaryQueueServiceClient.getProperties()
+        then:
+        QueueTestHelper.assertQueueServicePropertiesAreEqual(originalProperties, getResponseBefore.value())
+        QueueTestHelper.assertResponseStatusCode(setResponse, 202)
+        QueueTestHelper.assertQueueServicePropertiesAreEqual(updatedProperties, getResponseAfter.value())
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAsyncAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAsyncAPITests.groovy
new file mode 100644
index 000000000000..9464cdd9aa32
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueServiceAsyncAPITests.groovy
@@ -0,0 +1,200 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.storage.queue.QueueAsyncClient
+import com.azure.storage.queue.models.Logging
+import com.azure.storage.queue.models.Metrics
+import com.azure.storage.queue.models.QueueItem
+import com.azure.storage.queue.models.QueuesSegmentOptions
+import com.azure.storage.queue.models.RetentionPolicy
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageServiceProperties
+import reactor.test.StepVerifier
+import spock.lang.Unroll
+
+class QueueServiceAsyncAPITests extends APISpec {
+
+    def setup() {
+        primaryQueueServiceAsyncClient = queueServiceBuilderHelper(interceptorManager).buildAsyncClient()
+    }
+
+    def "Get queue client"() {
+        given:
+        def queueAsyncClient = primaryQueueServiceAsyncClient.getQueueAsyncClient(testResourceName.randomName(methodName, 60))
+        expect:
+        queueAsyncClient instanceof QueueAsyncClient
+    }
+
+    def "Create queue"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        expect:
+        StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName)).assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        StepVerifier.create(primaryQueueServiceAsyncClient.getQueueAsyncClient(queueName).enqueueMessage("Testing service client creating a queue"))
+            .assertNext {
+                assert QueueTestHelper.assertResponseStatusCode(it, 201)
+            }.verifyComplete()
+    }
+
+    @Unroll
+    def "Create queue with invalid name"() {
+        when:
+        def createQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName))
+        then:
+        createQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMesage)
+        }
+        where:
+        queueName      | statusCode | errMesage
+        "a_b"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "-ab"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "a--b"         | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "Abc"          | 400        | StorageErrorCode.INVALID_RESOURCE_NAME
+        "ab"           | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+        "verylong" * 8 | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
+    }
+
+    def "Create null"() {
+        when:
+        primaryQueueServiceAsyncClient.createQueue(null)
+        then:
+        thrown(NullPointerException)
+    }
+
+    @Unroll
+    def "Create queue maxOverload"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        when:
+        def createQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName, metadata))
+        def enqueueMessageVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getQueueAsyncClient(queueName)
+            .enqueueMessage("Testing service client creating a queue"))
+        then:
+        createQueueVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+        enqueueMessageVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 201)
+        }.verifyComplete()
+
+
+        where:
+        metadata                                       | _
+        null                                           | _
+        Collections.singletonMap("metadata", "value")  | _
+        Collections.singletonMap("metadata", "va@lue") | _
+    }
+
+    def "Create queue with invalid metadata"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        when:
+        def createQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.createQueue(queueName, Collections.singletonMap("meta@data", "value")))
+        then:
+        createQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 400, "Bad Request")
+        }
+    }
+
+    def "Delete queue"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        primaryQueueServiceAsyncClient.createQueue(queueName).block()
+        when:
+        def deleteQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.deleteQueue(queueName))
+        def enqueueMessageVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getQueueAsyncClient(queueName)
+            .enqueueMessage("Expecting exception as queue has been deleted."))
+        then:
+        deleteQueueVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 204)
+        }.verifyComplete()
+        enqueueMessageVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    def "Delete queue error"() {
+        when:
+        def deleteQueueVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.deleteQueue(testResourceName.randomName(methodName, 16)))
+        then:
+        deleteQueueVerifier.verifyErrorSatisfies {
+            assert QueueTestHelper.assertExceptionStatusCodeAndMessage(it, 404, StorageErrorCode.QUEUE_NOT_FOUND)
+        }
+    }
+
+    @Unroll
+    def "List queues"() {
+        given:
+        def queueName = testResourceName.randomName(methodName, 60)
+        LinkedList<QueueItem> testQueues = new LinkedList<>()
+        for (int i = 0; i < 3; i++) {
+            String version = Integer.toString(i)
+            QueueItem queue = new QueueItem().name(queueName + version)
+                .metadata(Collections.singletonMap("metadata" + version, "value" + version))
+            testQueues.add(queue)
+            primaryQueueServiceAsyncClient.createQueue(queue.name(), queue.metadata()).block()
+        }
+        when:
+        def queueListVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.listQueues(options))
+        then:
+        queueListVerifier.assertNext {
+            assert QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+        }.assertNext {
+            assert QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+        }.assertNext {
+            assert QueueTestHelper.assertQueuesAreEqual(it, testQueues.pop())
+        }.verifyComplete()
+        where:
+        options                                                                                        | _
+        new QueuesSegmentOptions().prefix("queueserviceasyncapitestslistqueues")                       | _
+        new QueuesSegmentOptions().prefix("queueserviceasyncapitestslistqueues").maxResults(2)         | _
+        new QueuesSegmentOptions().prefix("queueserviceasyncapitestslistqueues").includeMetadata(true) | _
+    }
+
+    def "List empty queues"() {
+        when:
+        def listQueueVerifier = StepVerifier.create((primaryQueueServiceAsyncClient.listQueues(new QueuesSegmentOptions())))
+        then:
+        listQueueVerifier.assertNext {
+            !it.iterator().hasNext()
+        }
+    }
+
+    def "Get and set properties"() {
+        given:
+        def originalProperties = primaryQueueServiceAsyncClient.getProperties().block().value()
+        def retentionPolicy = new RetentionPolicy().enabled(true)
+            .days(3)
+        def logging = new Logging().version("1.0")
+            .delete(true)
+            .write(true)
+            .retentionPolicy(retentionPolicy)
+        def metrics = new Metrics().enabled(true)
+            .includeAPIs(false)
+            .retentionPolicy(retentionPolicy)
+            .version("1.0")
+        def updatedProperties = new StorageServiceProperties().logging(logging)
+            .hourMetrics(metrics)
+            .minuteMetrics(metrics)
+            .cors(new ArrayList<>())
+        when:
+        def getPropertiesBeforeVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getProperties())
+        def setPropertiesVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.setProperties(updatedProperties))
+        def getPropertiesAfterVerifier = StepVerifier.create(primaryQueueServiceAsyncClient.getProperties())
+        then:
+        getPropertiesBeforeVerifier.assertNext {
+            assert QueueTestHelper.assertQueueServicePropertiesAreEqual(originalProperties, it.value())
+        }
+        setPropertiesVerifier.assertNext {
+            assert QueueTestHelper.assertResponseStatusCode(it, 202)
+        }.verifyComplete()
+
+        getPropertiesAfterVerifier.assertNext {
+            assert QueueTestHelper.assertQueueServicePropertiesAreEqual(updatedProperties, it.value())
+        }.verifyComplete()
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueTestHelper.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueTestHelper.groovy
new file mode 100644
index 000000000000..63d6afeed4e4
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/spock/QueueTestHelper.groovy
@@ -0,0 +1,161 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.queue.spock
+
+import com.azure.core.http.rest.Response
+import com.azure.core.implementation.util.ImplUtils
+import com.azure.core.util.configuration.ConfigurationManager
+import com.azure.storage.queue.models.CorsRule
+import com.azure.storage.queue.models.Logging
+import com.azure.storage.queue.models.Metrics
+import com.azure.storage.queue.models.QueueItem
+import com.azure.storage.queue.models.RetentionPolicy
+import com.azure.storage.queue.models.SignedIdentifier
+import com.azure.storage.queue.models.StorageErrorCode
+import com.azure.storage.queue.models.StorageErrorException
+import com.azure.storage.queue.models.StorageServiceProperties
+
+import java.time.Duration
+
+class QueueTestHelper {
+    static boolean assertResponseStatusCode(Response<?> response, int expectedStatusCode) {
+        return expectedStatusCode == response.statusCode()
+    }
+
+    static boolean assertExceptionStatusCodeAndMessage(Throwable throwable, int expectedStatusCode, String errMessage) {
+        return assertExceptionStatusCode(throwable, expectedStatusCode) && assertExceptionErrorMessage(throwable, errMessage)
+    }
+
+    static boolean assertExceptionStatusCodeAndMessage(Throwable throwable, int expectedStatusCode, StorageErrorCode errMessage) {
+        return assertExceptionStatusCode(throwable, expectedStatusCode) && assertExceptionErrorMessage(throwable, errMessage)
+    }
+
+    static boolean assertExceptionStatusCode(Throwable throwable, int expectedStatusCode) {
+        if (!throwable instanceof StorageErrorException) {
+            return false
+        }
+        StorageErrorException storageErrorException = (StorageErrorException) throwable
+        return expectedStatusCode == storageErrorException.response().statusCode()
+    }
+
+    static boolean assertExceptionErrorMessage(Throwable throwable, String errMessage) {
+        return throwable instanceof StorageErrorException && throwable.getMessage().contains(errMessage)
+    }
+
+    static boolean assertExceptionErrorMessage(Throwable throwable, StorageErrorCode errMessage) {
+        return throwable instanceof StorageErrorException && throwable.getMessage().contains(errMessage.toString())
+    }
+
+    static boolean assertQueuesAreEqual(QueueItem expected, QueueItem actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            if (!Objects.equals(expected.name(), actual.name())) {
+                return false
+            }
+            if (expected.metadata() != null && !ImplUtils.isNullOrEmpty(actual.metadata())) {
+                return expected.metadata().equals(actual.metadata())
+            }
+            return true
+        }
+    }
+
+    static boolean assertQueueServicePropertiesAreEqual(StorageServiceProperties expected, StorageServiceProperties actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return assertMetricsAreEqual(expected.hourMetrics(), actual.hourMetrics()) &&
+                assertMetricsAreEqual(expected.minuteMetrics(), actual.minuteMetrics()) &&
+                assertLoggingAreEqual(expected.logging(), actual.logging()) &&
+                assertCorsAreEqual(expected.cors(), actual.cors())
+        }
+    }
+
+    static boolean assertMetricsAreEqual(Metrics expected, Metrics actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.enabled(), actual.enabled()) &&
+                Objects.equals(expected.includeAPIs(), actual.includeAPIs()) &&
+                Objects.equals(expected.version(), actual.version()) &&
+                assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy())
+        }
+    }
+
+    static boolean assertLoggingAreEqual(Logging expected, Logging actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.read(), actual.read()) &&
+                Objects.equals(expected.write(), actual.write()) &&
+                Objects.equals(expected.delete(), actual.delete()) &&
+                Objects.equals(expected.version(), actual.version()) &&
+                assertRetentionPoliciesAreEqual(expected.retentionPolicy(), actual.retentionPolicy())
+        }
+    }
+
+    static boolean assertRetentionPoliciesAreEqual(RetentionPolicy expected, RetentionPolicy actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.days(), actual.days()) &&
+                Objects.equals(expected.enabled(), actual.enabled())
+        }
+    }
+
+    static boolean assertCorsAreEqual(List<CorsRule> expected, List<CorsRule> actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            if (expected.size() != actual.size()) {
+                return false
+            }
+            for (int i = 0; i < expected.size(); i++) {
+                if (!assertCorRulesAreEqual(expected.get(i), actual.get(i))) {
+                    return false
+                }
+            }
+            return true
+        }
+    }
+
+    static boolean assertCorRulesAreEqual(CorsRule expected, CorsRule actual) {
+        if (expected == null) {
+            return actual == null
+        } else {
+            return Objects.equals(expected.allowedHeaders(), actual.allowedHeaders()) &&
+                Objects.equals(expected.allowedMethods(), actual.allowedMethods()) &&
+                Objects.equals(expected.allowedOrigins(), actual.allowedOrigins()) &&
+                Objects.equals(expected.maxAgeInSeconds(), actual.maxAgeInSeconds())
+        }
+    }
+
+    static boolean assertPermissionsAreEqual(SignedIdentifier expected, SignedIdentifier actual) {
+        if (expected == null) {
+            return actual == null
+        }
+        if (expected.accessPolicy() == null) {
+            return actual.accessPolicy() == null
+        }
+        return Objects.equals(expected.id(), actual.id()) &&
+            Objects.equals(expected.accessPolicy().permission(), actual.accessPolicy().permission()) &&
+            Objects.equals(expected.accessPolicy().start(), actual.accessPolicy().start()) &&
+            Objects.equals(expected.accessPolicy().expiry(), actual.accessPolicy().expiry())
+    }
+
+    static void sleepInRecord(Duration time) {
+        String azureTestMode = ConfigurationManager.getConfiguration().get("AZURE_TEST_MODE")
+        if ("RECORD".equalsIgnoreCase(azureTestMode)) {
+            sleep(time)
+        }
+    }
+
+    private static void sleep(Duration time) {
+        try {
+            Thread.sleep(time.toMillis())
+        } catch (InterruptedException ex) {
+            // Ignore the error
+        }
+    }
+}
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessages.json
similarity index 54%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessage.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessages.json
index a0d2027ab04f..ed54b9123e2f 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessage.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessages.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d53d-4003-00b9-6703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-request-id" : "86d0af92-d003-0034-1588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,74 +29,73 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d56d-4003-00b9-1003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5e400587-ca00-4a0e-a557-f8c4d2e2c6c7</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAzOOURANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
+      "x-ms-request-id" : "86d0af9b-d003-0034-1c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0d14b209-ac51-4fd3-8191-c134fc31ec65</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:23 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcmFdIohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages?numofmessages=1&visibilitytimeout=30",
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071d58c-4003-00b9-2f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5e400587-ca00-4a0e-a557-f8c4d2e2c6c7</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAMD99VgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:33 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af9e-d003-0034-1e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7c1347ef-6779-43f2-8b7f-6d33bfee66a3</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:23 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA7rliIohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages/5e400587-ca00-4a0e-a557-f8c4d2e2c6c7?popreceipt=AgAAAAMAAAAAAAAAMD99VgNH1QE%3d&visibilitytimeout=1",
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-time-next-visible" : "Tue, 30 Jul 2019 18:19:04 GMT",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d5ad-4003-00b9-5003-47d378000000",
-      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAA+cM6RQNH1QEBAAAA",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0afab-d003-0034-2888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>50d1dc30-e0f6-4af7-9361-7af98593d4e4</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:23 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAizloIohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages?peekonly=true",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "3",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071dba1-4003-00b9-0a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5e400587-ca00-4a0e-a557-f8c4d2e2c6c7</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>1</DequeueCount><MessageText>updated test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:05 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "86d0afae-d003-0034-2b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45/messages",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -104,25 +103,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071dbb7-4003-00b9-2003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:05 GMT"
+      "x-ms-request-id" : "86d0afb9-d003-0034-3388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:23 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20800231",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessages581140c4bfcb340be45?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dbd1-4003-00b9-3a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:05 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b033-d003-0034-1c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   } ],
-  "variables" : [ "queue20800231" ]
+  "variables" : [ "queueapitestsclearmessages581140c4bfcb340be45" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessagesError.json
new file mode 100644
index 000000000000..feb60836c10b
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsClearMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsclearmessageserror122895bd11a3c794a/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b046-d003-0034-2e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b046-d003-0034-2e88-539fde000000\nTime:2019-08-15T16:40:24.6890548Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsclearmessageserror122895bd11a3c794a" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsCreateQueueWithSharedKey.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsCreateQueueWithSharedKey.json
new file mode 100644
index 000000000000..371a132c6bb3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsCreateQueueWithSharedKey.json
@@ -0,0 +1,20 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestscreatequeuewithsharedkey08458bcc81be1e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0a973-d003-0034-2088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:11 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestscreatequeuewithsharedkey08458bcc81be1e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteExistQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteExistQueue.json
new file mode 100644
index 000000000000..b40ca18da630
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteExistQueue.json
@@ -0,0 +1,36 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeleteexistqueue16092c5b3100623794",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aaa8-d003-0034-3a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:12 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeleteexistqueue16092c5b3100623794",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0aaab-d003-0034-3c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:12 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestsdeleteexistqueue16092c5b3100623794" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessage.json
similarity index 53%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessages.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessage.json
index cebb31166bc9..dca62988411f 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessages.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessage.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d18f-4003-00b9-5e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b058-d003-0034-3b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,17 +29,17 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d1bb-4003-00b9-0603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>1a1dabd1-b690-42c7-a22a-665c69ceffcc</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:02 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:02 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAi1HbQwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:02 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "86d0b05d-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>93569445-b0d1-4230-998c-3c502ddc767b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAv9gvI4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:24 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -48,17 +48,17 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d1dd-4003-00b9-2503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>c10ecce0-b3b6-4098-96ae-8aa611501ffb</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:02 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:02 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAVabiQwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:02 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "86d0b064-d003-0034-4588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0ee737df-f37c-41cc-8f4a-d53c7426e5cd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA7EI2I4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:24 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -67,51 +67,36 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d201-4003-00b9-4603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>962a6b38-e375-4fae-a052-8d25207ff09b</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:02 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:02 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAv9fnQwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:02 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "86d0b06d-d003-0034-4d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f2d85c0a-9cbe-43fa-9323-766e875322cc</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAjNA+I4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:24 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages?numofmessages=1&visibilitytimeout=30",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "3",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d225-4003-00b9-6903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d23d-4003-00b9-8003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b072-d003-0034-5188-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>93569445-b0d1-4230-998c-3c502ddc767b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:24 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:24 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAZWgmNYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:54 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -119,17 +104,17 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
+      "x-ms-approximate-messages-count" : "3",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d257-4003-00b9-1703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b075-d003-0034-5488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41/messages/93569445-b0d1-4230-998c-3c502ddc767b?popreceipt=AgAAAAMAAAAAAAAAZWgmNYhT1QE%3d",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -137,25 +122,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071d26d-4003-00b9-2d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0b07b-d003-0034-5a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue78895e13",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessage20200a7539ef17c4a41?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d283-4003-00b9-4303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-approximate-messages-count" : "2",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b083-d003-0034-6288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
     }
   } ],
-  "variables" : [ "queue78895e13" ]
+  "variables" : [ "queueapitestsdeletemessage20200a7539ef17c4a41" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs0.json
new file mode 100644
index 000000000000..dc272ed0c65c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs0.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b093-d003-0034-7088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b09d-d003-0034-7788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>04214a11-cec5-4791-ba97-8228b2da7a45</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA+yR7I4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:25 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b0a2-d003-0034-7b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>04214a11-cec5-4791-ba97-8228b2da7a45</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAADAtjNYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:55 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs09162111d13721/messages/04214a11-cec5-4791-ba97-8228b2da7a45?popreceipt=AgAAAAMAAAAAAAAADAtjNYhT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b0a5-d003-0034-7e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b0a5-d003-0034-7e88-539fde000000\nTime:2019-08-15T16:40:25.4037442Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAADAtjNYhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:24 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdeletemessageinvalidargs09162111d13721" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs1.json
similarity index 51%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMessage.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs1.json
index 235330aad38c..a4539a5b6961 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMessage.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071bb3b-4003-00b9-2f03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT"
+      "x-ms-request-id" : "86d0b0b6-d003-0034-0e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:25 GMT"
     }
   }, {
     "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6/messages?visibilitytimeout=0&messagettl=604800",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3/messages?visibilitytimeout=0&messagettl=604800",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,17 +29,17 @@
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071bb62-4003-00b9-5403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e019e0ee-2a4a-4a02-ba68-ecd484c51b2c</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:55 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:55 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAszfJPwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:55 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
+      "x-ms-request-id" : "86d0b0bd-d003-0034-1488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>34e78151-51d8-45fa-b3f4-f3e5a1e6c31f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAARv6kI4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:25 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:25 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6/messages?numofmessages=1&visibilitytimeout=30",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3/messages?numofmessages=1&visibilitytimeout=30",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -48,43 +48,30 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071bb7d-4003-00b9-6e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e019e0ee-2a4a-4a02-ba68-ecd484c51b2c</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:55 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:55 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAGAywUQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:25 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
+      "x-ms-request-id" : "86d0b0c0-d003-0034-1688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>34e78151-51d8-45fa-b3f4-f3e5a1e6c31f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:25 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:25 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAASb2MNYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:55 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:25 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs158450b740d8f3/messages/34e78151-51d8-45fa-b3f4-f3e5a1e6c31fRandom?popreceipt=AgAAAAMAAAAAAAAASb2MNYhT1QE%3d",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bb94-4003-00b9-0403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue854564d6",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bbb2-4003-00b9-2103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT"
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b0c4-d003-0034-1a88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0b0c4-d003-0034-1a88-539fde000000\nTime:2019-08-15T16:40:26.7240160Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue854564d6" ]
+  "variables" : [ "queueapitestsdeletemessageinvalidargs158450b740d8f3" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs2.json
new file mode 100644
index 000000000000..b42487e3c437
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteMessageInvalidArgs2.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b156-d003-0034-1888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b15a-d003-0034-1b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d44b25ff-a01e-46c3-a447-96fe43f58dcc</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:26 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:26 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA2md0JIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:26 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b162-d003-0034-2288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d44b25ff-a01e-46c3-a447-96fe43f58dcc</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:26 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:26 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA7tRdNohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:57 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletemessageinvalidargs2763886d20e03f/messages/d44b25ff-a01e-46c3-a447-96fe43f58dccRandom?popreceipt=AgAAAAMAAAAAAAAA7tRdNohT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b166-d003-0034-2688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b166-d003-0034-2688-539fde000000\nTime:2019-08-15T16:40:27.0473254Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAA7tRdNohT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdeletemessageinvalidargs2763886d20e03f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSharedKey.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteQueueError.json
similarity index 64%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSharedKey.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteQueueError.json
index f7db9ce0ce35..ca2f032e1942 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSharedKey.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDeleteQueueError.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue07130666/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdeletequeueerror47957ce5611a14cab4",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,11 +13,11 @@
       "retry-after" : "0",
       "Content-Length" : "217",
       "StatusCode" : "404",
-      "x-ms-request-id" : "807249d1-4003-00b9-4903-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807249d1-4003-00b9-4903-47d378000000\nTime:2019-07-30T18:19:38.6260705Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
+      "x-ms-request-id" : "86d0aabe-d003-0034-4c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0aabe-d003-0034-4c88-539fde000000\nTime:2019-08-15T16:40:13.4041901Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:12 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue07130666" ]
+  "variables" : [ "queueapitestsdeletequeueerror47957ce5611a14cab4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMessage.json
new file mode 100644
index 000000000000..34052e1ef61a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemessage40686e81eb135e6394b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aea3-d003-0034-4888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemessage40686e81eb135e6394b/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aea8-d003-0034-4c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>37450095-9ca3-4ca2-99a1-bae358e91a42</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA9N08IYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemessage40686e81eb135e6394b/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aeae-d003-0034-5088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>37450095-9ca3-4ca2-99a1-bae358e91a42</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAHwcrM4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdequeuemessage40686e81eb135e6394b" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMultipleMessages.json
new file mode 100644
index 000000000000..cc703c743ce7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aeba-d003-0034-5c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aec1-d003-0034-6288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>1cd3a95f-913c-4ef2-a26c-ed2b2a46fa00</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAxQFpIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aed1-d003-0034-6f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>ac53ec4a-dc07-4a31-a089-3dbc2a66a05d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAADaFyIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuemultiplemessages96761fe8475eda/messages?numofmessages=2&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aed7-d003-0034-7388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>1cd3a95f-913c-4ef2-a26c-ed2b2a46fa00</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcVxcM4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>ac53ec4a-dc07-4a31-a089-3dbc2a66a05d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:21 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcVxcM4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdequeuemultiplemessages96761fe8475eda" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueTooManyMessage.json
new file mode 100644
index 000000000000..6ff627a06894
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsDequeueTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuetoomanymessage820232eb14b1658",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aee4-d003-0034-7f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsdequeuetoomanymessage820232eb14b1658/messages?numofmessages=33&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0aee9-d003-0034-0388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0aee9-d003-0034-0388-539fde000000\nTime:2019-08-15T16:40:22.1496102Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsdequeuetoomanymessage820232eb14b1658" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueEmptyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueEmptyMessage.json
new file mode 100644
index 000000000000..3ecbe42fe7f1
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueEmptyMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueueemptymessage69434f760bff89a1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae5f-d003-0034-0c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueueemptymessage69434f760bff89a1/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae64-d003-0034-1088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0541e4ad-a35d-436e-adaa-1b7e39276645</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAWdTNIIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:20 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueueemptymessage69434f760bff89a1/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ae77-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0541e4ad-a35d-436e-adaa-1b7e39276645</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText /></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsenqueueemptymessage69434f760bff89a1" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueMessage.json
new file mode 100644
index 000000000000..b0caf47f0fb4
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuemessage05407f375599df86241",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae3a-d003-0034-6988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuemessage05407f375599df86241/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae45-d003-0034-7388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2593cc1c-1b8c-44ad-88a1-57fd2eba3fd6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAmIaYIIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:20 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuemessage05407f375599df86241/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ae51-d003-0034-7e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2593cc1c-1b8c-44ad-88a1-57fd2eba3fd6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:20 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:20 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsenqueuemessage05407f375599df86241" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueTimeToLive.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueTimeToLive.json
new file mode 100644
index 000000000000..31e4c78f7180
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsEnqueueTimeToLive.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuetimetolive94210574071164c6f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae88-d003-0034-3088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsenqueuetimetolive94210574071164c6f/messages?visibilitytimeout=0&messagettl=2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae97-d003-0034-3d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>06a2ea01-3dc2-4a7d-b352-2a0471fface0</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:21 GMT</InsertionTime><ExpirationTime>Thu, 15 Aug 2019 16:40:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAdiMiIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:21 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:20 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsenqueuetimetolive94210574071164c6f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicy.json
new file mode 100644
index 000000000000..7c104d49cf6b
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicy.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetaccesspolicy3986549d9a11fe03c4",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac98-d003-0034-0188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:16 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetaccesspolicy3986549d9a11fe03c4?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aca0-d003-0034-0888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers />",
+      "Date" : "Thu, 15 Aug 2019 16:40:17 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetaccesspolicy3986549d9a11fe03c4" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicyError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicyError.json
new file mode 100644
index 000000000000..fb065f326b17
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetAccessPolicyError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetaccesspolicyerror58413efeb5fdae94?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0ad6f-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0ad6f-d003-0034-3f88-539fde000000\nTime:2019-08-15T16:40:18.6602495Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetaccesspolicyerror58413efeb5fdae94" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetProperties.json
new file mode 100644
index 000000000000..81502bd84d67
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetProperties.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetproperties49283bebfe496c1124d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aad7-d003-0034-6388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetproperties49283bebfe496c1124d?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aae0-d003-0034-6b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetproperties49283bebfe496c1124d" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetPropertiesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetPropertiesError.json
new file mode 100644
index 000000000000..f2a64cf9961d
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsGetPropertiesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsgetpropertieserror86495a85dbf5a65c1?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0ab03-d003-0034-0988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0ab03-d003-0034-0988-539fde000000\nTime:2019-08-15T16:40:13.7735459Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsgetpropertieserror86495a85dbf5a65c1" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessage.json
new file mode 100644
index 000000000000..d2012bf8ba5f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessagequeueapitestspeekmessage944948491b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aef6-d003-0034-1088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessagequeueapitestspeekmessage944948491b/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0aefe-d003-0034-1788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>33245f64-21f2-4a10-84c2-f010f339e2ae</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAR8O0IYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:22 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessagequeueapitestspeekmessage944948491b/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0af00-d003-0034-1988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>33245f64-21f2-4a10-84c2-f010f339e2ae</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:21 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeekmessagequeueapitestspeekmessage944948491b" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessagesError.json
new file mode 100644
index 000000000000..716f59b91442
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmessageserror659934ae7b76e1ec7/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0af82-d003-0034-0988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0af82-d003-0034-0988-539fde000000\nTime:2019-08-15T16:40:23.3367515Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeekmessageserror659934ae7b76e1ec7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMultipleMessages.json
new file mode 100644
index 000000000000..4031845fa5cf
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af13-d003-0034-2c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af1d-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3a919a7a-35c7-4553-b19d-68b7d97f9ed8</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAPNbUIYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:22 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af32-d003-0034-4688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2e8db9be-aa49-41a9-afb0-d9af0211f6b1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAfGz4IYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:22 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeekmultiplemessages99123b27adb7405a/messages?numofmessages=2&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0af4b-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3a919a7a-35c7-4553-b19d-68b7d97f9ed8</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>2e8db9be-aa49-41a9-afb0-d9af0211f6b1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:22 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:22 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeekmultiplemessages99123b27adb7405a" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekTooManyMessage.json
new file mode 100644
index 000000000000..2e0cc4207f4c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsPeekTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeektoomanymessage8011625e0f9c2fd32",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0af60-d003-0034-6c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestspeektoomanymessage8011625e0f9c2fd32/messages?numofmessages=33&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0af66-d003-0034-7088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0af66-d003-0034-7088-539fde000000\nTime:2019-08-15T16:40:23.2106294Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:22 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestspeektoomanymessage8011625e0f9c2fd32" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAccessPolicy.json
similarity index 50%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicy.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAccessPolicy.json
index cc3a358651b1..96f21b61b602 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicy.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAccessPolicy.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetaccesspolicy7404808264b0d36334",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "807244f3-4003-00b9-1603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0ad7a-d003-0034-4688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetaccesspolicy7404808264b0d36334?comp=acl",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
       "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
@@ -29,15 +29,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "80724521-4003-00b9-4103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0ad9a-d003-0034-5f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetaccesspolicy7404808264b0d36334?comp=acl",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -46,43 +46,11 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "80724540-4003-00b9-5f03-47d378000000",
+      "x-ms-request-id" : "86d0ad9e-d003-0034-6388-539fde000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>testpermission</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>raup</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT",
       "Content-Type" : "application/xml"
     }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724551-4003-00b9-7003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue392406b1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724569-4003-00b9-0803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
   } ],
-  "variables" : [ "queue392406b1" ]
+  "variables" : [ "queueapitestssetaccesspolicy7404808264b0d36334" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata0.json
similarity index 59%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicy.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata0.json
index f4583b3a1ca6..7b3c4ae923c0 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicy.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata0.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,34 +12,33 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d4c3-4003-00b9-7003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-request-id" : "86d0ab14-d003-0034-1888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d4e3-4003-00b9-0e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers />",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "86d0ab1c-d003-0034-1f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -47,25 +46,28 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071d4fb-4003-00b9-2603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-request-id" : "86d0ab22-d003-0034-2588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9583269e",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata069712b1b824a4f5a?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d50b-4003-00b9-3503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab36-d003-0034-3988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:13 GMT"
     }
   } ],
-  "variables" : [ "queue9583269e" ]
+  "variables" : [ "queueapitestssetandclearmetadata069712b1b824a4f5a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata1.json
new file mode 100644
index 000000000000..0a9eb98b06e5
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata1.json
@@ -0,0 +1,74 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ab5e-d003-0034-5f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab66-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0ab6d-d003-0034-6d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata1133922d063e915d5?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab74-d003-0034-7488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestssetandclearmetadata1133922d063e915d5" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceSameMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata2.json
similarity index 58%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceSameMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata2.json
index 49af0912970a..7eb7f876733b 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceSameMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata2.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,31 +12,34 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8072446f-4003-00b9-1303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT"
+      "x-ms-request-id" : "86d0ab8b-d003-0034-0a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724495-4003-00b9-3803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ab97-d003-0034-1588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -44,25 +47,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "807244ad-4003-00b9-5003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT"
+      "x-ms-request-id" : "86d0ab9f-d003-0034-1d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue8880966a",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata2975245e5d3767672?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807244ca-4003-00b9-6d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0aba3-d003-0034-2188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
     }
   } ],
-  "variables" : [ "queue8880966a" ]
+  "variables" : [ "queueapitestssetandclearmetadata2975245e5d3767672" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata3.json
new file mode 100644
index 000000000000..1ccfd178abb2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata3.json
@@ -0,0 +1,74 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0abc0-d003-0034-3d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0abc8-d003-0034-4488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0abcb-d003-0034-4788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata3109857c8883f83ac?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0abdb-d003-0034-5588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:14 GMT"
+    }
+  } ],
+  "variables" : [ "queueapitestssetandclearmetadata3109857c8883f83ac" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata4.json
similarity index 62%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/getProperties.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata4.json
index c603492afe88..41a4e1aaeb97 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getProperties.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetAndClearMetadata4.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071d0a9-4003-00b9-7f03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0abf5-d003-0034-6d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -29,18 +29,16 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071d0df-4003-00b9-3403-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0abf9-d003-0034-7088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -48,25 +46,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071d0ff-4003-00b9-5303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-request-id" : "86d0ac00-d003-0034-7788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue98021a59",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetandclearmetadata4441364d33a3358d9?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d123-4003-00b9-7703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ac04-d003-0034-7b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
     }
   } ],
-  "variables" : [ "queue98021a59" ]
+  "variables" : [ "queueapitestssetandclearmetadata4441364d33a3358d9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidAccessPolicy.json
new file mode 100644
index 000000000000..69072b76cfb7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidAccessPolicy.json
@@ -0,0 +1,40 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidaccesspolicy272461d7c8ddd05",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0adb1-d003-0034-7588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidaccesspolicy272461d7c8ddd05?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidXmlDocument",
+      "retry-after" : "0",
+      "Content-Length" : "371",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0adb5-d003-0034-7888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0adb5-d003-0034-7888-539fde000000\nTime:2019-08-15T16:40:19.3749389Z</Message><LineNumber>1</LineNumber><LinePosition>304</LinePosition><Reason>Signed identifier ID cannot be empty or over 64 characters in length</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:18 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidaccesspolicy272461d7c8ddd05" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
new file mode 100644
index 000000000000..d67771bd47f4
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
@@ -0,0 +1,38 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta086912efa51a8ecf394",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac2d-d003-0034-2288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta086912efa51a8ecf394?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "AuthenticationFailed",
+      "retry-after" : "0",
+      "Content-Length" : "787",
+      "StatusCode" : "403",
+      "x-ms-request-id" : "86d0ac31-d003-0034-2588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:86d0ac31-d003-0034-2588-539fde000000\nTime:2019-08-15T16:40:15.9366308Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'eFSCtqZMmfvr497wo8VI4QmqpGPc177ZljiKa2e1R9U=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 15 Aug 2019 16:40:15 GMT\n\n\n\n\n\nx-ms-client-request-id:0fc39ac3-c8b7-4559-9dc7-d7626792fc6c\nx-ms-meta-invalidmeta:value\nx-ms-version:2018-03-28\n/azstoragesdkaccount/queueapitestssetinvalidmeta086912efa51a8ecf394\ncomp:metadata'.</AuthenticationErrorDetail></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta086912efa51a8ecf394" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
new file mode 100644
index 000000000000..9bc7be9b6093
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta113448acbafb9121ae4",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac44-d003-0034-3888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta113448acbafb9121ae4?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ac47-d003-0034-3a88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0ac47-d003-0034-3a88-539fde000000\nTime:2019-08-15T16:40:16.1618482Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta113448acbafb9121ae4" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
new file mode 100644
index 000000000000..f382dd8feb4a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta2080827789296bb3fb4",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac5d-d003-0034-4d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta2080827789296bb3fb4?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ac62-d003-0034-5188-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0ac62-d003-0034-5188-539fde000000\nTime:2019-08-15T16:40:16.3650438Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta2080827789296bb3fb4" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json
new file mode 100644
index 000000000000..e9408913c72f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta34802248c56de5d4824",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ac7c-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:16 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta34802248c56de5d4824?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "EmptyMetadataKey",
+      "retry-after" : "0",
+      "Content-Length" : "278",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ac84-d003-0034-6d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:86d0ac84-d003-0034-6d88-539fde000000\nTime:2019-08-15T16:40:16.5552281Z</Message><MetadataValue>value</MetadataValue></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:16 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetinvalidmeta34802248c56de5d4824" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMetadataQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMetadataQueueError.json
new file mode 100644
index 000000000000..2db96a476326
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMetadataQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmetadataqueueerror215410bb255310f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0ac1d-d003-0034-1488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0ac1d-d003-0034-1488-539fde000000\nTime:2019-08-15T16:40:15.7774776Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:15 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetmetadataqueueerror215410bb255310f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMultipleAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMultipleAccessPolicies.json
new file mode 100644
index 000000000000..a9505d0667f9
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetMultipleAccessPolicies.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmultipleaccesspolicies16522a4462e10",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0adcb-d003-0034-0c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmultipleaccesspolicies16522a4462e10?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0ade0-d003-0034-1f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetmultipleaccesspolicies16522a4462e10?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0adfb-d003-0034-3788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>policy0</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy1</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy2</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestssetmultipleaccesspolicies16522a4462e10" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetTooManyAccessPolicies.json
similarity index 55%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetTooManyAccessPolicies.json
index 831f07e70edb..751949a2a5e5 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setAccessPolicyQueueDoesNotExist.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetTooManyAccessPolicies.json
@@ -1,43 +1,40 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue15204045?comp=acl",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssettoomanyaccesspolicies3701347c5c1a20",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidXmlDocument",
       "retry-after" : "0",
-      "Content-Length" : "294",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "80724e15-4003-00b9-6d03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:80724e15-4003-00b9-6d03-47d378000000\nTime:2019-07-30T18:19:39.7961551Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ae24-d003-0034-5688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue15204045/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssettoomanyaccesspolicies3701347c5c1a20?comp=acl",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
+      "x-ms-error-code" : "InvalidXmlDocument",
       "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724e34-4003-00b9-0b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724e34-4003-00b9-0b03-47d378000000\nTime:2019-07-30T18:19:39.8241820Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
+      "Content-Length" : "294",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0ae2b-d003-0034-5c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0ae2b-d003-0034-5c88-539fde000000\nTime:2019-08-15T16:40:20.2267603Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:19 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue15204045" ]
+  "variables" : [ "queueapitestssettoomanyaccesspolicies3701347c5c1a20" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessage.json
new file mode 100644
index 000000000000..dd811d7af558
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessage.json
@@ -0,0 +1,96 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b172-d003-0034-3288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b179-d003-0034-3688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>866fcfcf-4cf2-4300-8845-9ac23c9412fd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:27 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:27 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeLaeJIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:27 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b17f-d003-0034-3c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>866fcfcf-4cf2-4300-8845-9ac23c9412fd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:27 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:27 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA3RGHNohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:57 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages/866fcfcf-4cf2-4300-8845-9ac23c9412fd?popreceipt=AgAAAAMAAAAAAAAA3RGHNohT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-time-next-visible" : "Thu, 15 Aug 2019 16:40:28 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b187-d003-0034-4388-539fde000000",
+      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAAXrZIJYhT1QEBAAAA",
+      "Date" : "Thu, 15 Aug 2019 16:40:26 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessage06951bc591bb0333646/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b24c-d003-0034-7988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>866fcfcf-4cf2-4300-8845-9ac23c9412fd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:27 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:27 GMT</ExpirationTime><DequeueCount>1</DequeueCount><MessageText>Updated test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:28 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessage06951bc591bb0333646" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs0.json
new file mode 100644
index 000000000000..c2bb5757978c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs0.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b262-d003-0034-0b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b268-d003-0034-1088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3d7de84c-5922-4d48-82f5-9553b755e13b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAATQkOJohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:29 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b26f-d003-0034-1688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3d7de84c-5922-4d48-82f5-9553b755e13b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAp3L5N4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:59 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs045293d7291d09/messages/3d7de84c-5922-4d48-82f5-9553b755e13b?popreceipt=AgAAAAMAAAAAAAAAp3L5N4hT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b279-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b279-d003-0034-2088-539fde000000\nTime:2019-08-15T16:40:29.7699461Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAp3L5N4hT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessageinvalidargs045293d7291d09" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs1.json
new file mode 100644
index 000000000000..0913d3eafa66
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs1.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b28d-d003-0034-3488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b292-d003-0034-3888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6580708f-66e8-44e6-ba98-b8247beac271</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAh2xCJohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:29 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b297-d003-0034-3d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6580708f-66e8-44e6-ba98-b8247beac271</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:29 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:29 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAfCsqOIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:00 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs176891560f8faf/messages/6580708f-66e8-44e6-ba98-b8247beac271Random?popreceipt=AgAAAAMAAAAAAAAAfCsqOIhT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b299-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0b299-d003-0034-3f88-539fde000000\nTime:2019-08-15T16:40:30.0582240Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessageinvalidargs176891560f8faf" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs2.json
new file mode 100644
index 000000000000..3cff8e232573
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsUpdateMessageInvalidArgs2.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2a7-d003-0034-4d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2ad-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3be89eec-a4f2-45ab-a197-b821b7d11f10</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:30 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:30 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAcZtoJohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:30 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b2af-d003-0034-5488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3be89eec-a4f2-45ab-a197-b821b7d11f10</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:30 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:30 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAARQxQOIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:00 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestsupdatemessageinvalidargs273318b807b04f/messages/3be89eec-a4f2-45ab-a197-b821b7d11f10Random?popreceipt=AgAAAAMAAAAAAAAARQxQOIhT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b2b6-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b2b6-d003-0034-5b88-539fde000000\nTime:2019-08-15T16:40:30.3204768Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAARQxQOIhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:29 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueapitestsupdatemessageinvalidargs273318b807b04f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessages.json
new file mode 100644
index 000000000000..a711e3c38c58
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessages.json
@@ -0,0 +1,129 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b714-d003-0034-3f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b71a-d003-0034-4488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a61f6509-9183-4eb9-ac29-1059bef85949</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAEb3/KohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b72e-d003-0034-5688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4a640ede-fbc9-4097-b825-3a0ec2ae05b0</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAHLEQK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b733-d003-0034-5a88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5edab073-8f3c-4a0e-8f78-6cfe7c4b5909</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA+6UWK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "3",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b73a-d003-0034-6188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b73f-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessages2567745c37cf84523?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b74b-d003-0034-7188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsclearmessages2567745c37cf84523" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessagesError.json
new file mode 100644
index 000000000000..5d910550c22a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsClearMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsclearmessageserror568252add7763d/messages",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b769-d003-0034-0c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b769-d003-0034-0c88-539fde000000\nTime:2019-08-15T16:40:38.4563063Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsclearmessageserror568252add7763d" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsCreateQueueWithSharedKey.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsCreateQueueWithSharedKey.json
new file mode 100644
index 000000000000..c0b23667f8c5
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsCreateQueueWithSharedKey.json
@@ -0,0 +1,20 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestscreatequeuewithsharedkey2100736fe3e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2d8-d003-0034-7c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestscreatequeuewithsharedkey2100736fe3e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteExistQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteExistQueue.json
new file mode 100644
index 000000000000..a20509a553ac
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteExistQueue.json
@@ -0,0 +1,36 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeleteexistqueue35019918c3a4f50",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b2e9-d003-0034-0c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeleteexistqueue35019918c3a4f50",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b2f1-d003-0034-1388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeleteexistqueue35019918c3a4f50" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessage.json
new file mode 100644
index 000000000000..78fe32bbd659
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessage.json
@@ -0,0 +1,148 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b780-d003-0034-1e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b789-d003-0034-2588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2bae208e-e182-4f46-99d3-802e85696bb7</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAxopkK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b7bd-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5ef9d501-16ee-46fa-948e-92efe33db2bb</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA+jyOK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b7c3-d003-0034-5888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>66929325-4169-46f6-9896-13ec28a9ab4f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKyCTK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b7cd-d003-0034-6088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2bae208e-e182-4f46-99d3-802e85696bb7</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:38 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA3nd9PYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "3",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b7d7-d003-0034-6a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e/messages/2bae208e-e182-4f46-99d3-802e85696bb7?popreceipt=AgAAAAMAAAAAAAAA3nd9PYhT1QE%3d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b7dd-d003-0034-7088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessage4169294d235e7b53e?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "2",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b7e6-d003-0034-7888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessage4169294d235e7b53e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs0.json
new file mode 100644
index 000000000000..c5bee287ae31
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs0.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b811-d003-0034-2188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b81a-d003-0034-2888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cc32b131-2313-4b2f-ad90-3c488f10aa7e</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAM23TK4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:39 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b822-d003-0034-2f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cc32b131-2313-4b2f-ad90-3c488f10aa7e</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAGQW7PYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:09 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs08956721757c/messages/cc32b131-2313-4b2f-ad90-3c488f10aa7e?popreceipt=AgAAAAMAAAAAAAAAGQW7PYhT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b832-d003-0034-3d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b832-d003-0034-3d88-539fde000000\nTime:2019-08-15T16:40:39.4532674Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAGQW7PYhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:38 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessageinvalidargs08956721757c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs1.json
new file mode 100644
index 000000000000..a08c635e6dd8
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs1.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b851-d003-0034-5888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b855-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cce066f1-dccd-40ef-9cdf-49ee0abf187f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKjH+K4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:39 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b880-d003-0034-0588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cce066f1-dccd-40ef-9cdf-49ee0abf187f</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:39 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:39 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAtYILPohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:09 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs139342f37ce7/messages/cce066f1-dccd-40ef-9cdf-49ee0abf187fRandom?popreceipt=AgAAAAMAAAAAAAAAtYILPohT1QE%3d",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b896-d003-0034-1988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0b896-d003-0034-1988-539fde000000\nTime:2019-08-15T16:40:39.9947896Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessageinvalidargs139342f37ce7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs2.json
new file mode 100644
index 000000000000..e9745e23d903
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteMessageInvalidArgs2.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b8ac-d003-0034-2e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b8b6-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7e87aa91-446d-4d94-b215-499b6b6eb968</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKuBTLIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:40 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b8ca-d003-0034-4288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7e87aa91-446d-4d94-b215-499b6b6eb968</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAu6VCPohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:10 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletemessageinvalidargs2341209dfb46/messages/7e87aa91-446d-4d94-b215-499b6b6eb968Random?popreceipt=AgAAAAMAAAAAAAAAu6VCPohT1QE%3dRandom",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b8e8-d003-0034-5e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0b8e8-d003-0034-5e88-539fde000000\nTime:2019-08-15T16:40:40.4482269Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAu6VCPohT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:39 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletemessageinvalidargs2341209dfb46" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteQueueError.json
new file mode 100644
index 000000000000..28150a0ec5eb
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDeleteQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdeletequeueerror841810489e711bf",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b2f9-d003-0034-1b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b2f9-d003-0034-1b88-539fde000000\nTime:2019-08-15T16:40:30.9681013Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdeletequeueerror841810489e711bf" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMessage.json
new file mode 100644
index 000000000000..3c3216aab4fe
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemessage34127c045be0e4fc",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b571-d003-0034-4c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemessage34127c045be0e4fc/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b576-d003-0034-5088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>13b53b78-978f-45ea-b9f3-ff7dde5fbfc6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAjVPRKYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemessage34127c045be0e4fc/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b588-d003-0034-5e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>13b53b78-978f-45ea-b9f3-ff7dde5fbfc6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeUrFO4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdequeuemessage34127c045be0e4fc" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMultipleMessages.json
new file mode 100644
index 000000000000..ece1c39197f3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b59a-d003-0034-6e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b5a1-d003-0034-7488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f4f91806-40cc-44ce-b6d9-190aa231e712</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA5MH/KYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b5a6-d003-0034-7988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d247edfb-148b-4ced-bba3-086e248b11cf</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAO3oGKohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuemultiplemessages92682dd8f696/messages?numofmessages=2&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b5b1-d003-0034-0388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f4f91806-40cc-44ce-b6d9-190aa231e712</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAk9j3O4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>d247edfb-148b-4ced-bba3-086e248b11cf</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:36 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAk9j3O4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdequeuemultiplemessages92682dd8f696" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueTooManyMessage.json
new file mode 100644
index 000000000000..88673523a9ef
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsDequeueTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuetoomanymessage93456993efa0c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b5f1-d003-0034-3e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsdequeuetoomanymessage93456993efa0c/messages?numofmessages=33&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b5ff-d003-0034-4b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0b5ff-d003-0034-4b88-539fde000000\nTime:2019-08-15T16:40:36.7857017Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsdequeuetoomanymessage93456993efa0c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueEmptyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueEmptyMessage.json
new file mode 100644
index 000000000000..fc93aefae27a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueEmptyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueueemptymessage777007b0c97652",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b544-d003-0034-2188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueueemptymessage777007b0c97652/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b54d-d003-0034-2988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cf835a57-768b-4887-ad77-b58cfe5a49bd</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAMZ+TKYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsenqueueemptymessage777007b0c97652" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueMessage.json
new file mode 100644
index 000000000000..e800017754bc
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuemessage918982b8274b3853",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b51c-d003-0034-7c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuemessage918982b8274b3853/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b526-d003-0034-0588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>331a480a-83cd-4c6d-bd42-64a1878d57f3</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:35 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbbBqKYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsenqueuemessage918982b8274b3853" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueTimeToLive.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueTimeToLive.json
new file mode 100644
index 000000000000..e05acbb8dae2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsEnqueueTimeToLive.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuetimetolive942001ea0bb1007",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b55d-d003-0034-3988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsenqueuetimetolive942001ea0bb1007/messages?visibilitytimeout=0&messagettl=2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b564-d003-0034-3f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4dfa6c0e-0faa-4f92-9327-4fc14c151027</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:35 GMT</InsertionTime><ExpirationTime>Thu, 15 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKzm1KYhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:35 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:35 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsenqueuetimetolive942001ea0bb1007" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicy.json
new file mode 100644
index 000000000000..3288923c2dd0
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicy.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetaccesspolicy13402477ddf897a6",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b45e-d003-0034-5388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetaccesspolicy13402477ddf897a6?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b469-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers />",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetaccesspolicy13402477ddf897a6" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicyDoesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicyDoesError.json
new file mode 100644
index 000000000000..af256fc76af8
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetAccessPolicyDoesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetaccesspolicydoeserror56212d23d22?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b489-d003-0034-7888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b489-d003-0034-7888-539fde000000\nTime:2019-08-15T16:40:34.0060234Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetaccesspolicydoeserror56212d23d22" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetProperties.json
new file mode 100644
index 000000000000..d9603b7d9e31
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetProperties.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetproperties7430531cdaa42d19a",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b303-d003-0034-2388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetproperties7430531cdaa42d19a?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b30e-d003-0034-2a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetproperties7430531cdaa42d19a" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetPropertiesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetPropertiesError.json
new file mode 100644
index 000000000000..457195c34d0f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsGetPropertiesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsgetpropertieserror93872b7a1476bc?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b326-d003-0034-3c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b326-d003-0034-3c88-539fde000000\nTime:2019-08-15T16:40:31.3074281Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsgetpropertieserror93872b7a1476bc" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessage.json
new file mode 100644
index 000000000000..25a3ea95b585
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessage.json
@@ -0,0 +1,58 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessage47817372b7f2dd8224",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b643-d003-0034-0888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessage47817372b7f2dd8224/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b654-d003-0034-1488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6dc6a926-5c00-44f4-8de2-e89c54c611da</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA/u17KohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessage47817372b7f2dd8224/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b661-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6dc6a926-5c00-44f4-8de2-e89c54c611da</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeekmessage47817372b7f2dd8224" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessagesError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessagesError.json
new file mode 100644
index 000000000000..7126fe327311
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMessagesError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmessageserror93819ee1f00a5b7/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b707-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b707-d003-0034-3488-539fde000000\nTime:2019-08-15T16:40:37.8036777Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeekmessageserror93819ee1f00a5b7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMultipleMessages.json
new file mode 100644
index 000000000000..a047b153bf5a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekMultipleMessages.json
@@ -0,0 +1,77 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b67a-d003-0034-3988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b687-d003-0034-4588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>62f01e0b-b0a0-462f-a8b7-503c6dce7bf2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAACb2gKohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b691-d003-0034-4d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>971fc67e-a10f-42a0-85ba-d16ef58d30d9</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAihWmKohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeekmultiplemessages0423782806747/messages?numofmessages=2&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b6ac-d003-0034-6688-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>62f01e0b-b0a0-462f-a8b7-503c6dce7bf2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 1</MessageText></QueueMessage><QueueMessage><MessageId>971fc67e-a10f-42a0-85ba-d16ef58d30d9</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:37 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:36 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeekmultiplemessages0423782806747" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekTooManyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekTooManyMessage.json
new file mode 100644
index 000000000000..13518cbf820a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsPeekTooManyMessage.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeektoomanymessage67437d1be16832",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b6e1-d003-0034-1088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestspeektoomanymessage67437d1be16832/messages?numofmessages=33&peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "456",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b6f1-d003-0034-1f88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:86d0b6f1-d003-0034-1f88-539fde000000\nTime:2019-08-15T16:40:37.6515310Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>33</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:37 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestspeektoomanymessage67437d1be16832" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAccessPolicy.json
new file mode 100644
index 000000000000..a9be7cf8b45d
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAccessPolicy.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetaccesspolicy18055e6054856759",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b493-d003-0034-0188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetaccesspolicy18055e6054856759?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b49b-d003-0034-0888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetaccesspolicy18055e6054856759?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b49f-d003-0034-0c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>testpermission</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>raup</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetaccesspolicy18055e6054856759" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata0.json
new file mode 100644
index 000000000000..39a66b3fea58
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata0.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b330-d003-0034-4588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:30 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b33b-d003-0034-4f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b346-d003-0034-5a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata0775692feb2e02?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b34c-d003-0034-6088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetandclearmetadata0775692feb2e02" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceDifferentMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata1.json
similarity index 58%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceDifferentMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata1.json
index 70bd9c8373e7..7ed34369afe8 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createTwiceDifferentMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,34 +12,34 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "807246c6-4003-00b9-5d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0b35e-d003-0034-7288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueAlreadyExists",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "222",
-      "StatusCode" : "409",
-      "x-ms-request-id" : "807246f2-4003-00b9-0403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueAlreadyExists</Code><Message>The specified queue already exists.\nRequestId:807246f2-4003-00b9-0403-47d378000000\nTime:2019-07-30T18:19:37.7522623Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b364-d003-0034-7788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -47,25 +47,28 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "80724708-4003-00b9-1a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-request-id" : "86d0b369-d003-0034-7c88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60199648",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata16389313ee0457?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724714-4003-00b9-2503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b36d-d003-0034-8088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
     }
   } ],
-  "variables" : [ "queue60199648" ]
+  "variables" : [ "queueaysncapitestssetandclearmetadata16389313ee0457" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata2.json
new file mode 100644
index 000000000000..f65ae6875bfb
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata2.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b382-d003-0034-1188-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "x-ms-meta-metadata1" : "value",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b388-d003-0034-1688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b38c-d003-0034-1a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata2207469fbef13f?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b390-d003-0034-1e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetandclearmetadata2207469fbef13f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata3.json
new file mode 100644
index 000000000000..76ba1d97280a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata3.json
@@ -0,0 +1,74 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b3a5-d003-0034-3088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b3ab-d003-0034-3588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b3b1-d003-0034-3a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:31 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata3352166135e768?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "x-ms-meta-metadata" : "value",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b3b6-d003-0034-3e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetandclearmetadata3352166135e768" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata4.json
similarity index 62%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata4.json
index de90dd17f28c..5910a551d6c3 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetAndClearMetadata4.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8071dcea-4003-00b9-4003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-request-id" : "86d0b3c7-d003-0034-4f88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -29,18 +29,16 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8071dd11-4003-00b9-6603-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-request-id" : "86d0b3cf-d003-0034-5688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -48,25 +46,27 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8071dd3b-4003-00b9-0f03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-request-id" : "86d0b3d3-d003-0034-5a88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue23765c5d",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetandclearmetadata4960994418e531?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dd54-4003-00b9-2703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
+      "x-ms-approximate-messages-count" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b3d7-d003-0034-5e88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
     }
   } ],
-  "variables" : [ "queue23765c5d" ]
+  "variables" : [ "queueaysncapitestssetandclearmetadata4960994418e531" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidAccessPolicy.json
new file mode 100644
index 000000000000..9c6ac803b9f8
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidAccessPolicy.json
@@ -0,0 +1,40 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidaccesspolicy33486e6d29ea",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b4b6-d003-0034-2088-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidaccesspolicy33486e6d29ea?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidXmlDocument",
+      "retry-after" : "0",
+      "Content-Length" : "371",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b4c0-d003-0034-2788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0b4c0-d003-0034-2788-539fde000000\nTime:2019-08-15T16:40:34.4924928Z</Message><LineNumber>1</LineNumber><LinePosition>304</LinePosition><Reason>Signed identifier ID cannot be empty or over 64 characters in length</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidaccesspolicy33486e6d29ea" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
new file mode 100644
index 000000000000..b88111954c67
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
@@ -0,0 +1,38 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta01683215ccccf91c2",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b3f6-d003-0034-7988-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta01683215ccccf91c2?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "AuthenticationFailed",
+      "retry-after" : "0",
+      "Content-Length" : "790",
+      "StatusCode" : "403",
+      "x-ms-request-id" : "86d0b401-d003-0034-0288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:86d0b401-d003-0034-0288-539fde000000\nTime:2019-08-15T16:40:33.1201697Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'e+GF4D6YPu1FAAvKG8lumPMuaoEpcPbaCCWI3NCVxQ8=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 15 Aug 2019 16:40:33 GMT\n\n\n\n\n\nx-ms-client-request-id:5d04df0d-c387-4de8-8021-1db1a744ee09\nx-ms-meta-invalidmeta:value\nx-ms-version:2018-03-28\n/azstoragesdkaccount/queueaysncapitestssetinvalidmeta01683215ccccf91c2\ncomp:metadata'.</AuthenticationErrorDetail></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta01683215ccccf91c2" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
new file mode 100644
index 000000000000..6ee282eda8d3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta1355070856bfd3545",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b414-d003-0034-1288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta1355070856bfd3545?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b416-d003-0034-1388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0b416-d003-0034-1388-539fde000000\nTime:2019-08-15T16:40:33.2923348Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta1355070856bfd3545" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
new file mode 100644
index 000000000000..da2ee9274904
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta275909d41ee97d45b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b428-d003-0034-2288-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta275909d41ee97d45b?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
+      "retry-after" : "0",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b42e-d003-0034-2788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:86d0b42e-d003-0034-2788-539fde000000\nTime:2019-08-15T16:40:33.4715096Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta275909d41ee97d45b" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json
new file mode 100644
index 000000000000..e55852f38e1f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta350468db0a5487ffa",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b43c-d003-0034-3588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta350468db0a5487ffa?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "EmptyMetadataKey",
+      "retry-after" : "0",
+      "Content-Length" : "278",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b446-d003-0034-3e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:86d0b446-d003-0034-3e88-539fde000000\nTime:2019-08-15T16:40:33.6326628Z</Message><MetadataValue>value</MetadataValue></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:33 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetinvalidmeta350468db0a5487ffa" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMetadataQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMetadataQueueError.json
new file mode 100644
index 000000000000..3ae851d04a98
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMetadataQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmetadataqueueerror74958551a725e?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0b3e6-d003-0034-6c88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:86d0b3e6-d003-0034-6c88-539fde000000\nTime:2019-08-15T16:40:32.9049634Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:32 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetmetadataqueueerror74958551a725e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMultipleAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMultipleAccessPolicies.json
new file mode 100644
index 000000000000..4e1877b8f62d
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetMultipleAccessPolicies.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmultipleaccesspolicies342073fd3a7",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b4d8-d003-0034-3d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmultipleaccesspolicies342073fd3a7?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b4e0-d003-0034-4488-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetmultipleaccesspolicies342073fd3a7?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b4ee-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>policy0</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy1</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>policy2</Id><AccessPolicy><Start>2000-01-01T00:00:00.0000000Z</Start><Expiry>2020-01-01T00:00:00.0000000Z</Expiry><Permission>r</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssetmultipleaccesspolicies342073fd3a7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetTooManyAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetTooManyAccessPolicies.json
new file mode 100644
index 000000000000..666a75494585
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetTooManyAccessPolicies.json
@@ -0,0 +1,40 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssettoomanyaccesspolicies064709aed35",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b503-d003-0034-6688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssettoomanyaccesspolicies064709aed35?comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidXmlDocument",
+      "retry-after" : "0",
+      "Content-Length" : "294",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0b50d-d003-0034-6d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:86d0b50d-d003-0034-6d88-539fde000000\nTime:2019-08-15T16:40:35.0590380Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:34 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestssettoomanyaccesspolicies064709aed35" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessage.json
new file mode 100644
index 000000000000..4e7971e698f7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessage.json
@@ -0,0 +1,96 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b911-d003-0034-0788-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0b918-d003-0034-0d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4e5ffd01-82ac-44ee-a37d-526ab678478d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAZx6cLIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:40 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0b925-d003-0034-1988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4e5ffd01-82ac-44ee-a37d-526ab678478d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAW92DPohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:10 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages/4e5ffd01-82ac-44ee-a37d-526ab678478d?popreceipt=AgAAAAMAAAAAAAAAW92DPohT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-time-next-visible" : "Thu, 15 Aug 2019 16:40:41 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "86d0b933-d003-0034-2788-539fde000000",
+      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAAhYVDLYhT1QEBAAAA",
+      "Date" : "Thu, 15 Aug 2019 16:40:40 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessage4445813bb0fe8e591/messages?peekonly=true",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0ba71-d003-0034-5888-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4e5ffd01-82ac-44ee-a37d-526ab678478d</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:40 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:40 GMT</ExpirationTime><DequeueCount>1</DequeueCount><MessageText>Updated test message</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessage4445813bb0fe8e591" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs0.json
new file mode 100644
index 000000000000..71fa55e9834c
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs0.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ba95-d003-0034-7888-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0ba9d-d003-0034-7d88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>ed0c89e4-9fc0-4d1c-b6d7-e558cda27df2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAxNcTLohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0baa4-d003-0034-0288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>ed0c89e4-9fc0-4d1c-b6d7-e558cda27df2</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAJjP8P4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs081201908aa6/messages/ed0c89e4-9fc0-4d1c-b6d7-e558cda27df2?popreceipt=AgAAAAMAAAAAAAAAJjP8P4hT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0baae-d003-0034-0b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0baae-d003-0034-0b88-539fde000000\nTime:2019-08-15T16:40:43.2038761Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAJjP8P4hT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessageinvalidargs081201908aa6" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs1.json
new file mode 100644
index 000000000000..8a058a925169
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs1.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bac1-d003-0034-1b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0baca-d003-0034-2188-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>bbfff9d1-bc64-428c-b460-f1419acc90a1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA/RA/LohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0bace-d003-0034-2588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>bbfff9d1-bc64-428c-b460-f1419acc90a1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAdgwmQIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs163307d0c678/messages/bbfff9d1-bc64-428c-b460-f1419acc90a1Random?popreceipt=AgAAAAMAAAAAAAAAdgwmQIhT1QE%3d&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "MessageNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "221",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "86d0bad4-d003-0034-2b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:86d0bad4-d003-0034-2b88-539fde000000\nTime:2019-08-15T16:40:43.4651281Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:42 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessageinvalidargs163307d0c678" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs2.json
new file mode 100644
index 000000000000..40ebda4b09ea
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsUpdateMessageInvalidArgs2.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0baed-d003-0034-4388-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0baf4-d003-0034-4988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>25b1663b-0917-4820-82ab-4841c1326b31</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAc4pnLohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd/messages?numofmessages=1&visibilitytimeout=30",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "86d0bafb-d003-0034-4e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>25b1663b-0917-4820-82ab-4841c1326b31</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAABdROQIhT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:41:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message before update</MessageText></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestsupdatemessageinvalidargs230456b8e3fd/messages/25b1663b-0917-4820-82ab-4841c1326b31Random?popreceipt=AgAAAAMAAAAAAAAABdROQIhT1QE%3dRandom&visibilitytimeout=1",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidQueryParameterValue",
+      "retry-after" : "0",
+      "Content-Length" : "444",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb0a-d003-0034-5b88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:86d0bb0a-d003-0034-5b88-539fde000000\nTime:2019-08-15T16:40:43.7233771Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAABdROQIhT1QE=Random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueaysncapitestsupdatemessageinvalidargs230456b8e3fd" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateNull.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateNull.json
new file mode 100644
index 000000000000..ba5f37f8f855
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateNull.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueue.json
new file mode 100644
index 000000000000..dc2a5a0a32e5
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueue.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeue074371e62a4ccfd46",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bb2f-d003-0034-7d88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeue074371e62a4ccfd46/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bb38-d003-0034-0588-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2e77531c-f441-41ef-9ff6-b6322409ae69</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:43 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAExyYLohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeue074371e62a4ccfd46" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload0.json
new file mode 100644
index 000000000000..484cc8e29533
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload0.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload074849a8610c",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbb3-d003-0034-7588-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload074849a8610c/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbc2-d003-0034-0288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>9c9a313c-99a1-4d0b-927f-94cf777190ef</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:44 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:44 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALE0xL4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:44 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeuemaxoverload074849a8610c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload1.json
new file mode 100644
index 000000000000..060f4484235a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload182562dfc26f",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbdd-d003-0034-1b88-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload182562dfc26f/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbe7-d003-0034-2388-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7662fa88-d012-476e-8db1-0438feb9d9b6</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:45 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:45 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAd0BNL4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:45 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeuemaxoverload182562dfc26f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload2.json
new file mode 100644
index 000000000000..89ca2b0ebfbc
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueMaxOverload2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload2383601fe697",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bbfd-d003-0034-3688-539fde000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestscreatequeuemaxoverload2383601fe697/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "86d0bc06-d003-0034-3e88-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a8cc78e1-6d22-47a4-9b1d-5af87883ad21</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:45 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:45 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAogxpL4hT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:45 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestscreatequeuemaxoverload2383601fe697" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidMetadata.json
new file mode 100644
index 000000000000..54410b10741f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidMetadata.json
@@ -0,0 +1,21 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/3fb1a9c3baec4586",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "Connection" : "close",
+      "retry-after" : "0",
+      "Content-Length" : "339",
+      "StatusCode" : "400",
+      "Body" : "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\"http://www.w3.org/TR/html4/strict.dtd\">\r\n<HTML><HEAD><TITLE>Bad Request</TITLE>\r\n<META HTTP-EQUIV=\"Content-Type\" Content=\"text/html; charset=us-ascii\"></HEAD>\r\n<BODY><h2>Bad Request - Invalid Header</h2>\r\n<hr><p>HTTP Error 400. The request has an invalid header name.</p>\r\n</BODY></HTML>\r\n",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "text/html; charset=us-ascii"
+    }
+  } ],
+  "variables" : [ "3fb1a9c3baec4586" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName0.json
new file mode 100644
index 000000000000..525fd6e4ea87
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName0.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a_b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb53-d003-0034-2088-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb53-d003-0034-2088-539fde000000\nTime:2019-08-15T16:40:44.2939271Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName1.json
new file mode 100644
index 000000000000..18fd8e02e7f3
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName1.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/-ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb5d-d003-0034-2988-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb5d-d003-0034-2988-539fde000000\nTime:2019-08-15T16:40:44.3950248Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:43 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName2.json
new file mode 100644
index 000000000000..6dc9821c78d2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName2.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a--b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb69-d003-0034-3488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb69-d003-0034-3488-539fde000000\nTime:2019-08-15T16:40:44.4961229Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName3.json
new file mode 100644
index 000000000000..e63f4a5b7881
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName3.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/Abc",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb7c-d003-0034-4788-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:86d0bb7c-d003-0034-4788-539fde000000\nTime:2019-08-15T16:40:44.5872096Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName4.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName4.json
new file mode 100644
index 000000000000..cd17d136fdfe
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName4.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb88-d003-0034-5288-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:86d0bb88-d003-0034-5288-539fde000000\nTime:2019-08-15T16:40:44.6823024Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName5.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName5.json
new file mode 100644
index 000000000000..ed1dfa6d0392
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsCreateQueueWithInvalidName5.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/verylongverylongverylongverylongverylongverylongverylongverylong",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "86d0bb9f-d003-0034-6488-539fde000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:86d0bb9f-d003-0034-6488-539fde000000\nTime:2019-08-15T16:40:44.7723883Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:44 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueue.json
new file mode 100644
index 000000000000..6b0c052b62a7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueue.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeue42052e8daafc75e56",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9c804-2003-0008-6c88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeue42052e8daafc75e56",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "b9c9c80f-2003-0008-7588-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeue42052e8daafc75e56/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "b9c9c819-2003-0008-7d88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9c819-2003-0008-7d88-532b05000000\nTime:2019-08-15T16:40:45.8743783Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestsdeletequeue42052e8daafc75e56" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueueError.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueueError.json
new file mode 100644
index 000000000000..4dcc7458529f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsDeleteQueueError.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestsdeletequeueerror1100262e3172b5",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "b9c9c827-2003-0008-0988-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9c827-2003-0008-0988-532b05000000\nTime:2019-08-15T16:40:45.9754728Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:45 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestsdeletequeueerror1100262e3172b5" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetAndSetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetAndSetProperties.json
new file mode 100644
index 000000000000..d0be4644da50
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetAndSetProperties.json
@@ -0,0 +1,78 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882d4f-6003-00ea-4088-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882d82-6003-00ea-6f88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-id" : "14882da7-6003-00ea-1288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:48 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882ebe-6003-00ea-1488-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:48 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetQueueClient.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetQueueClient.json
new file mode 100644
index 000000000000..dbb9e99a8d2a
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsGetQueueClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ "queueserviceapitestsgetqueueclient02320715bfd10cd" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListEmptyQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListEmptyQueues.json
new file mode 100644
index 000000000000..de513b4009ee
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListEmptyQueues.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=QueueServiceAPITestsListEmptyQueues&include=&comp=list",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882d28-6003-00ea-1b88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>QueueServiceAPITestsListEmptyQueues</Prefix><Queues /><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceapitestslistemptyqueues28264ca30cb29e2" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues0.json
similarity index 54%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues0.json
index cc245715abd6..84f3a0f6abae 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceSameMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues0.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b220",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,50 +12,47 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd82b9-e003-0073-5c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c84f-2003-0008-2b88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b221",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
+      "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd82bd-e003-0073-5f09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a1a192f0-d5b6-4a03-8365-eafbc589b4b0</MessageId><InsertionTime>Tue, 30 Jul 2019 19:01:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 19:01:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAW6ZEJAlH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 19:01:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "b9c9c86a-2003-0008-4488-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b222",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82c6-e003-0073-6609-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9c86f-2003-0008-4888-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182/messages?peekonly=true",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -64,36 +61,33 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd82cc-e003-0073-6c09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>a1a192f0-d5b6-4a03-8365-eafbc589b4b0</MessageId><InsertionTime>Tue, 30 Jul 2019 19:01:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 19:01:06 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>Testing service client creating the same queue twice does not modify the queue</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
+      "x-ms-request-id" : "b9c9c87b-2003-0008-5188-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceapitestslistqueues0197608aaded4b7b220</Name></Queue><Queue><Name>queueserviceapitestslistqueues0197608aaded4b7b221</Name></Queue><Queue><Name>queueserviceapitestslistqueues0197608aaded4b7b222</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue74324182&include=&comp=list",
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b220",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd82d9-e003-0073-7909-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue74324182</Prefix><Queues><Queue><Name>queue74324182</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "b9c9c880-2003-0008-5688-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b221",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -101,15 +95,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82e0-e003-0073-7f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
+      "x-ms-request-id" : "b9c9c888-2003-0008-5c88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue74324182",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues0197608aaded4b7b222",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -117,9 +111,9 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82e9-e003-0073-0709-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
+      "x-ms-request-id" : "b9c9c895-2003-0008-6788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   } ],
-  "variables" : [ "queue74324182" ]
+  "variables" : [ "queueserviceapitestslistqueues0197608aaded4b7b22" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues1.json
similarity index 51%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueues.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues1.json
index 60f43a830052..d529b881dd91 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueues.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd50",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,15 +12,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8272-e003-0073-1c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c89f-2003-0008-6f88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd51",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -28,15 +28,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8278-e003-0073-2109-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c8ab-2003-0008-7788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd52",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -44,15 +44,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd827e-e003-0073-2609-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "b9c9c8b0-2003-0008-7b88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue53815dd5&include=&comp=list",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -61,17 +61,17 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8286-e003-0073-2d09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue53815dd5</Prefix><Queues><Queue><Name>queue53815dd50</Name></Queue><Queue><Name>queue53815dd51</Name></Queue><Queue><Name>queue53815dd52</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
+      "x-ms-request-id" : "b9c9c8bd-2003-0008-0588-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceapitestslistqueues1262287461f7bb9c2c0</Name></Queue><Queue><Name>queueserviceapitestslistqueues1262287461f7bb9c2c1</Name></Queue></Queues><NextMarker>/azstoragesdkaccount/queueserviceapitestslistqueues1262287461f7bb9c2c2</NextMarker></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue53815dd5&include=&comp=list",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&marker=/azstoragesdkaccount/queueserviceapitestslistqueues1262287461f7bb9c2c2&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -80,17 +80,17 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd828a-e003-0073-3109-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue53815dd5</Prefix><Queues><Queue><Name>queue53815dd50</Name></Queue><Queue><Name>queue53815dd51</Name></Queue><Queue><Name>queue53815dd52</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
+      "x-ms-request-id" : "b9c9c8c6-2003-0008-0b88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><Marker>/azstoragesdkaccount/queueserviceapitestslistqueues1262287461f7bb9c2c2</Marker><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceapitestslistqueues1262287461f7bb9c2c2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd50/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -98,15 +98,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd828e-e003-0073-3409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "14882a79-6003-00ea-1088-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd50",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -114,15 +114,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8292-e003-0073-3809-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "14882b6a-6003-00ea-7588-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd51/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues1262287461f7bb9c2c2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -130,57 +130,9 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd829b-e003-0073-3f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd51",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82a2-e003-0073-4509-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd52/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82a8-e003-0073-4b09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue53815dd52",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd82b1-e003-0073-5409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "x-ms-request-id" : "14882b7e-6003-00ea-0988-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:46 GMT"
     }
   } ],
-  "variables" : [ "queue53815dd5" ]
+  "variables" : [ "queueserviceapitestslistqueues1262287461f7bb9c2c" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues2.json
similarity index 53%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessage.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues2.json
index f3bcf1a4fbf6..0284f7c87a30 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessage.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAPITestsListQueues2.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,87 +12,82 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "807248e4-4003-00b9-6403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "x-ms-request-id" : "14882bad-6003-00ea-3688-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
+      "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "80724919-4003-00b9-1703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>70decbfa-af3b-453f-b291-f78c97eb512d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA9GMvWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "14882ca0-6003-00ea-1b88-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages?numofmessages=1&visibilitytimeout=30",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724936-4003-00b9-3103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>70decbfa-af3b-453f-b291-f78c97eb512d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA8psVawNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:20:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14882cb8-6003-00ea-2e88-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages/70decbfa-af3b-453f-b291-f78c97eb512d?popreceipt=AgAAAAMAAAAAAAAA8psVawNH1QE%3d",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceapitestslistqueues&include=metadata&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724958-4003-00b9-5103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "14882ccc-6003-00ea-4188-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceapitestslistqueues2335005ecce17d3f5b0</Name><Metadata><metadata0>value0</metadata0></Metadata></Queue><Queue><Name>queueserviceapitestslistqueues2335005ecce17d3f5b1</Name><Metadata><metadata1>value1</metadata1></Metadata></Queue><Queue><Name>queueserviceapitestslistqueues2335005ecce17d3f5b2</Name><Metadata><metadata2>value2</metadata2></Metadata></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355?comp=metadata",
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724972-4003-00b9-6a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "StatusCode" : "204",
+      "x-ms-request-id" : "14882cde-6003-00ea-5388-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -100,15 +95,15 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "80724985-4003-00b9-7d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "x-ms-request-id" : "14882cee-6003-00ea-6288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue60865355",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceapitestslistqueues2335005ecce17d3f5b2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -116,9 +111,9 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8072499e-4003-00b9-1603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
+      "x-ms-request-id" : "14882cfe-6003-00ea-7288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:47 GMT"
     }
   } ],
-  "variables" : [ "queue60865355" ]
+  "variables" : [ "queueserviceapitestslistqueues2335005ecce17d3f5b" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateNull.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateNull.json
new file mode 100644
index 000000000000..ba5f37f8f855
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateNull.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueue.json
new file mode 100644
index 000000000000..2517bb6c4f49
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueue.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeue80797d675f4fdd",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14882f05-6003-00ea-5588-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:48 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeue80797d675f4fdd/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14882f2e-6003-00ea-7c88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>91d64df6-7e14-4818-b5ec-d683d139d7d4</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:49 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:49 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAqpkVMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:49 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeue80797d675f4fdd" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload0.json
new file mode 100644
index 000000000000..d5184d25f637
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload0.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload0158269f3",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14883095-6003-00ea-5288-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload0158269f3/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "148830a8-6003-00ea-6488-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2b6edef0-dc13-4d4a-86af-0aa1795df7f5</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:50 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:50 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAASo6vMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:50 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuemaxoverload0158269f3" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload1.json
new file mode 100644
index 000000000000..8f5a34864625
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload1.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload175671399",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "148830ec-6003-00ea-2788-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload175671399/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "148830ff-6003-00ea-3788-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>c0593110-94aa-4206-a6e1-07656271f3f1</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:51 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:51 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAkfrJMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuemaxoverload175671399" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload2.json
new file mode 100644
index 000000000000..067dc1c69797
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueMaxOverload2.json
@@ -0,0 +1,39 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload256562926",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "1488313b-6003-00ea-7088-53cf77000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuemaxoverload256562926/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "14883153-6003-00ea-0688-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>baa9aa21-4efe-4c65-aac3-a891899c6c3b</MessageId><InsertionTime>Thu, 15 Aug 2019 16:40:51 GMT</InsertionTime><ExpirationTime>Thu, 22 Aug 2019 16:40:51 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbcrjMohT1QE=</PopReceipt><TimeNextVisible>Thu, 15 Aug 2019 16:40:51 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuemaxoverload256562926" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidMetadata.json
new file mode 100644
index 000000000000..eec802198892
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidMetadata.json
@@ -0,0 +1,21 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestscreatequeuewithinvalidmetadata80018",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Server" : "Microsoft-HTTPAPI/2.0",
+      "Connection" : "close",
+      "retry-after" : "0",
+      "Content-Length" : "339",
+      "StatusCode" : "400",
+      "Body" : "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\"http://www.w3.org/TR/html4/strict.dtd\">\r\n<HTML><HEAD><TITLE>Bad Request</TITLE>\r\n<META HTTP-EQUIV=\"Content-Type\" Content=\"text/html; charset=us-ascii\"></HEAD>\r\n<BODY><h2>Bad Request - Invalid Header</h2>\r\n<hr><p>HTTP Error 400. The request has an invalid header name.</p>\r\n</BODY></HTML>\r\n",
+      "Date" : "Thu, 15 Aug 2019 16:40:50 GMT",
+      "Content-Type" : "text/html; charset=us-ascii"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestscreatequeuewithinvalidmetadata80018" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName0.json
new file mode 100644
index 000000000000..e37d99fa4008
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName0.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a_b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14882fb9-6003-00ea-7f88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14882fb9-6003-00ea-7f88-53cf77000000\nTime:2019-08-15T16:40:50.2152332Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName1.json
new file mode 100644
index 000000000000..ae1b42f193e9
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName1.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/-ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14882fd5-6003-00ea-1888-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14882fd5-6003-00ea-1888-53cf77000000\nTime:2019-08-15T16:40:50.2873012Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName2.json
new file mode 100644
index 000000000000..9e2488e28e65
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName2.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/a--b",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14882fed-6003-00ea-2f88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14882fed-6003-00ea-2f88-53cf77000000\nTime:2019-08-15T16:40:50.3633721Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName3.json
new file mode 100644
index 000000000000..8e94c068e5c7
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName3.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/Abc",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidResourceName",
+      "retry-after" : "0",
+      "Content-Length" : "243",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14883007-6003-00ea-4888-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidResourceName</Code><Message>The specifed resource name contains invalid characters.\nRequestId:14883007-6003-00ea-4888-53cf77000000\nTime:2019-08-15T16:40:50.4464512Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName4.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName4.json
new file mode 100644
index 000000000000..6fc511f8d939
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName4.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/ab",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "1488302b-6003-00ea-6a88-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:1488302b-6003-00ea-6a88-53cf77000000\nTime:2019-08-15T16:40:50.5385381Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName5.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName5.json
new file mode 100644
index 000000000000..5ecbd0458ed2
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsCreateQueueWithInvalidName5.json
@@ -0,0 +1,23 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/verylongverylongverylongverylongverylongverylongverylongverylong",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "256",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "14883049-6003-00ea-0788-53cf77000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The specified resource name length is not within the permissible limits.\nRequestId:14883049-6003-00ea-0788-53cf77000000\nTime:2019-08-15T16:40:50.6326265Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:49 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueue.json
new file mode 100644
index 000000000000..7a9abf6186ac
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueue.json
@@ -0,0 +1,56 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestsdeletequeue62103c4b54ee98",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cbb0-2003-0008-0788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
+    }
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestsdeletequeue62103c4b54ee98",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "204",
+      "x-ms-request-id" : "b9c9cbbb-2003-0008-1188-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
+    }
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestsdeletequeue62103c4b54ee98/messages?visibilitytimeout=0&messagettl=604800",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "QueueNotFound",
+      "retry-after" : "0",
+      "Content-Length" : "217",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "b9c9cbc3-2003-0008-1888-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9cbc3-2003-0008-1888-532b05000000\nTime:2019-08-15T16:40:51.4946206Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ "queueserviceasyncapitestsdeletequeue62103c4b54ee98" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSASToken.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueueError.json
similarity index 68%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSASToken.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueueError.json
index 06af19821b53..a07d9d72098a 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createWithSASToken.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsDeleteQueueError.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue95805f24/messages",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/5686b8e172374fd8",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,11 +13,11 @@
       "retry-after" : "0",
       "Content-Length" : "217",
       "StatusCode" : "404",
-      "x-ms-request-id" : "8071d154-4003-00b9-2803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d154-4003-00b9-2803-47d378000000\nTime:2019-07-30T18:19:02.4945662Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
+      "x-ms-request-id" : "b9c9cbcf-2003-0008-2388-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:b9c9cbcf-2003-0008-2388-532b05000000\nTime:2019-08-15T16:40:51.5867065Z</Message></Error>",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue95805f24" ]
+  "variables" : [ "5686b8e172374fd8" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetAndSetProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetAndSetProperties.json
new file mode 100644
index 000000000000..47c703d98b5f
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetAndSetProperties.json
@@ -0,0 +1,59 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9ccbc-2003-0008-6b88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
+    }
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0",
+      "Content-Type" : "application/xml; charset=utf-8"
+    },
+    "Response" : {
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-id" : "b9c9ccc0-2003-0008-6f88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:55 GMT"
+    }
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
+    "Headers" : {
+      "x-ms-version" : "2018-03-28",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cf1c-2003-0008-7788-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "Date" : "Thu, 15 Aug 2019 16:40:56 GMT",
+      "Content-Type" : "application/xml"
+    }
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetQueueClient.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetQueueClient.json
new file mode 100644
index 000000000000..a9126688e816
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsGetQueueClient.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ "queueserviceasyncapitestsgetqueueclient2398679f4afbe" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListEmptyQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListEmptyQueues.json
new file mode 100644
index 000000000000..ba5f37f8f855
--- /dev/null
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListEmptyQueues.json
@@ -0,0 +1,4 @@
+{
+  "networkCallRecords" : [ ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExistingQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues0.json
similarity index 57%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExistingQueue.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues0.json
index d711d370bf2b..2c54e0279c11 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExistingQueue.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues0.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue520260d0",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues009680da03558a90",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,51 +12,47 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8083-e003-0073-6a09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:01 GMT"
+      "x-ms-request-id" : "b9c9cbdd-2003-0008-3088-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue520260d0",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues009680da03558a91",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8163-e003-0073-3009-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cbe6-2003-0008-3788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue520260d0/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues009680da03558a92",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
       "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "1cdd8174-e003-0073-4009-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:1cdd8174-e003-0073-4009-4740b5000000\nTime:2019-07-30T19:01:03.1630238Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cbf2-2003-0008-3f88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
     "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue520260d0&include=&comp=list",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
@@ -65,11 +61,11 @@
       "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd817e-e003-0073-4809-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue520260d0</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
+      "x-ms-request-id" : "b9c9cbfa-2003-0008-4688-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceasyncapitestslistqueues009680da03558a90</Name></Queue><Queue><Name>queueserviceasyncapitestslistqueues009680da03558a91</Name></Queue><Queue><Name>queueserviceasyncapitestslistqueues009680da03558a92</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT",
       "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue520260d0" ]
+  "variables" : [ "queueserviceasyncapitestslistqueues009680da03558a9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues1.json
similarity index 50%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueue.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues1.json
index 6ace1ebfcc3d..e1af0b2334f9 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueue.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues1.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues104635a5e67dfac0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,79 +12,79 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd818b-e003-0073-5309-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT"
+      "x-ms-request-id" : "b9c9cc1f-2003-0008-6888-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:51 GMT"
     }
   }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54/messages?visibilitytimeout=0&messagettl=604800",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues104635a5e67dfac1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
+      "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd818f-e003-0073-5609-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>0f84abde-fb8c-4049-b6de-4e353f4af767</MessageId><InsertionTime>Tue, 30 Jul 2019 19:01:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 19:01:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAnQ1cIglH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 19:01:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "b9c9cc2b-2003-0008-7188-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue41192d54&include=&comp=list",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues104635a5e67dfac2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
-      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8195-e003-0073-5b09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue41192d54</Prefix><Queues><Queue><Name>queue41192d54</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:02 GMT",
-      "Content-Type" : "application/xml"
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cc33-2003-0008-7788-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54/messages",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8199-e003-0073-5f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cc4e-2003-0008-0d88-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceasyncapitestslistqueues104635a5e67dfac0</Name></Queue><Queue><Name>queueserviceasyncapitestslistqueues104635a5e67dfac1</Name></Queue></Queues><NextMarker>/azstoragesdkaccount/queueserviceasyncapitestslistqueues104635a5e67dfac2</NextMarker></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41192d54",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&marker=/azstoragesdkaccount/queueserviceasyncapitestslistqueues104635a5e67dfac2&maxresults=2&include=&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd81bb-e003-0073-7c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cc55-2003-0008-1488-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><Marker>/azstoragesdkaccount/queueserviceasyncapitestslistqueues104635a5e67dfac2</Marker><MaxResults>2</MaxResults><Queues><Queue><Name>queueserviceasyncapitestslistqueues104635a5e67dfac2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue41192d54" ]
+  "variables" : [ "queueserviceasyncapitestslistqueues104635a5e67dfac" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueWithMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues2.json
similarity index 51%
rename from sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueWithMetadata.json
rename to sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues2.json
index a884a0d89d21..f42927acdd60 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueWithMetadata.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueServiceAsyncAPITestsListQueues2.json
@@ -1,10 +1,10 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues25858399726d6ba0",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -12,80 +12,60 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd81fa-e003-0073-3209-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:04 GMT"
+      "x-ms-request-id" : "b9c9cc71-2003-0008-2e88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab?comp=metadata",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues25858399726d6ba1",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd824c-e003-0073-7709-4740b5000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 19:01:04 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue84974cab&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8258-e003-0073-0209-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue84974cab</Prefix><Queues><Queue><Name>queue84974cab</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT",
-      "Content-Type" : "application/xml"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cc77-2003-0008-3188-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab/messages",
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueserviceasyncapitestslistqueues25858399726d6ba2",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8260-e003-0073-0a09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b9c9cc86-2003-0008-3e88-532b05000000",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT"
     }
   }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue84974cab",
+    "Method" : "GET",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queueserviceasyncapitestslistqueues&include=metadata&comp=list",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
+      "Transfer-Encoding" : "chunked",
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "Cache-Control" : "no-cache",
       "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8267-e003-0073-1109-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:05 GMT"
+      "StatusCode" : "200",
+      "x-ms-request-id" : "b9c9cc8c-2003-0008-4388-532b05000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queueserviceasyncapitestslistqueues</Prefix><Queues><Queue><Name>queueserviceasyncapitestslistqueues25858399726d6ba0</Name><Metadata><metadata0>value0</metadata0></Metadata></Queue><Queue><Name>queueserviceasyncapitestslistqueues25858399726d6ba1</Name><Metadata><metadata1>value1</metadata1></Metadata></Queue><Queue><Name>queueserviceasyncapitestslistqueues25858399726d6ba2</Name><Metadata><metadata2>value2</metadata2></Metadata></Queue></Queues><NextMarker /></EnumerationResults>",
+      "Date" : "Thu, 15 Aug 2019 16:40:52 GMT",
+      "Content-Type" : "application/xml"
     }
   } ],
-  "variables" : [ "queue84974cab" ]
+  "variables" : [ "queueserviceasyncapitestslistqueues25858399726d6ba" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json
deleted file mode 100644
index d5ff4fab7281..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/clearMessagesQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue95540dc6/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071dd7c-4003-00b9-4f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071dd7c-4003-00b9-4f03-47d378000000\nTime:2019-07-30T18:19:06.4682531Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue95540dc6/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071dd94-4003-00b9-6603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071dd94-4003-00b9-6603-47d378000000\nTime:2019-07-30T18:19:06.4982809Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue95540dc6" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json
deleted file mode 100644
index 104f97276190..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/createQueueTwiceDifferentMetadata.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd82fd-e003-0073-1609-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueAlreadyExists",
-      "retry-after" : "0",
-      "Content-Length" : "222",
-      "StatusCode" : "409",
-      "x-ms-request-id" : "1cdd8301-e003-0073-1909-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueAlreadyExists</Code><Message>The specified queue already exists.\nRequestId:1cdd8301-e003-0073-1909-4740b5000000\nTime:2019-07-30T19:01:07.1007793Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue88691a05&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd830a-e003-0073-2009-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue88691a05</Prefix><Queues><Queue><Name>queue88691a05</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd830e-e003-0073-2409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue88691a05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8317-e003-0073-2d09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue88691a05" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExisting.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExisting.json
deleted file mode 100644
index 326bd01d83b8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteExisting.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071de75-4003-00b9-4103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dea3-4003-00b9-6e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>30cc479a-af92-4451-8a41-8413a8f9c095</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAFWldRgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071debe-4003-00b9-0903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724410-4003-00b9-3903-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724410-4003-00b9-3903-47d378000000\nTime:2019-07-30T18:19:36.9024744Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue11519005/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724439-4003-00b9-6003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724439-4003-00b9-6003-47d378000000\nTime:2019-07-30T18:19:36.9335030Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:36 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue11519005" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json
deleted file mode 100644
index 02698922bb52..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidMessageId.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bd76-4003-00b9-5603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bda8-4003-00b9-0603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6c6a6f5b-e93c-4712-a9e6-9d882ef2725d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAJ00nQANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:56 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071bdd6-4003-00b9-3403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6c6a6f5b-e93c-4712-a9e6-9d882ef2725d</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAb4EPUgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:26 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages/6c6a6f5b-e93c-4712-a9e6-9d882ef2725drandom?popreceipt=AgAAAAMAAAAAAAAAb4EPUgNH1QE%3d",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "MessageNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "221",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071be01-4003-00b9-5f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:8071be01-4003-00b9-5f03-47d378000000\nTime:2019-07-30T18:18:56.4930009Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071be28-4003-00b9-0603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5582925f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071be47-4003-00b9-2403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  } ],
-  "variables" : [ "queue5582925f" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json
deleted file mode 100644
index 875c4a238ffb..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageInvalidPopReceipt.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bc63-4003-00b9-4d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071bc9c-4003-00b9-0403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>9a59b835-0fa6-4bcb-8094-61e61a4120c2</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAGXD/PwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:56 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071bcc5-4003-00b9-2b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>9a59b835-0fa6-4bcb-8094-61e61a4120c2</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:18:56 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAb6TnUQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:26 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages/9a59b835-0fa6-4bcb-8094-61e61a4120c2?popreceipt=AgAAAAMAAAAAAAAAb6TnUQNH1QE%3drandom",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "444",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071bcf4-4003-00b9-5803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:8071bcf4-4003-00b9-5803-47d378000000\nTime:2019-07-30T18:18:56.2297573Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAAb6TnUQNH1QE=random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bd1d-4003-00b9-7e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue76680d09",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071bd3c-4003-00b9-1c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  } ],
-  "variables" : [ "queue76680d09" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json
deleted file mode 100644
index 287a17ccf8f1..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMessageQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5543243d/messages/invalid?popreceipt=call",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724c3c-4003-00b9-2003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724c3c-4003-00b9-2003-47d378000000\nTime:2019-07-30T18:19:39.3217165Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5543243d/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724c62-4003-00b9-4503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724c62-4003-00b9-4503-47d378000000\nTime:2019-07-30T18:19:39.3547455Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue5543243d" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMetadata.json
deleted file mode 100644
index 705c7722d081..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteMetadata.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724d57-4003-00b9-3403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724d80-4003-00b9-5a03-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724d98-4003-00b9-7203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724db1-4003-00b9-0b03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724dd4-4003-00b9-2d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue743794d9",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724dec-4003-00b9-4503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  } ],
-  "variables" : [ "queue743794d9" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistent.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistent.json
deleted file mode 100644
index 525cc82bc6b9..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistent.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue784292a2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724806-4003-00b9-0b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724806-4003-00b9-0b03-47d378000000\nTime:2019-07-30T18:19:38.1306132Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue784292a2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724826-4003-00b9-2a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724826-4003-00b9-2a03-47d378000000\nTime:2019-07-30T18:19:38.1606401Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue784292a2" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistentQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistentQueue.json
deleted file mode 100644
index 2e67336c2204..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/deleteNonExistentQueue.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue5883546e",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "1cdd8355-e003-0073-6209-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:1cdd8355-e003-0073-6209-4740b5000000\nTime:2019-07-30T19:01:07.7774261Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue5883546e&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8359-e003-0073-6609-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue5883546e</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue5883546e" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMultipleMessages.json
deleted file mode 100644
index aacfeda6c1d6..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueMultipleMessages.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724a13-4003-00b9-0803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724a33-4003-00b9-2703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>be3d48d4-b018-40ad-85a7-d426fb4d785f</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAA2tgWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724a57-4003-00b9-4a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f39387d0-8ac4-4739-80a3-a1e1f8d118df</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAANU5lWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages?numofmessages=2&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724a74-4003-00b9-6603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>be3d48d4-b018-40ad-85a7-d426fb4d785f</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeftLawNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:20:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage><QueueMessage><MessageId>f39387d0-8ac4-4739-80a3-a1e1f8d118df</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAeftLawNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:20:08 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724a8f-4003-00b9-7e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue41164c5f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724aa5-4003-00b9-1403-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  } ],
-  "variables" : [ "queue41164c5f" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json
deleted file mode 100644
index c92f5ac1b9fb..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue03640269/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "807247b8-4003-00b9-4003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807247b8-4003-00b9-4003-47d378000000\nTime:2019-07-30T18:19:38.0495370Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue03640269/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "807247d2-4003-00b9-5803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807247d2-4003-00b9-5803-47d378000000\nTime:2019-07-30T18:19:38.0825673Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue03640269" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueTooManyMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueTooManyMessages.json
deleted file mode 100644
index c1216be98ccd..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/dequeueTooManyMessages.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071cf82-4003-00b9-6203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725/messages?numofmessages=64&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "456",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071cfa7-4003-00b9-0503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:8071cfa7-4003-00b9-0503-47d378000000\nTime:2019-07-30T18:19:01.9911001Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>64</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cfc0-4003-00b9-1d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue33803725",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cfe1-4003-00b9-3d03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  } ],
-  "variables" : [ "queue33803725" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueEmptyMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueEmptyMessage.json
deleted file mode 100644
index 015e74ada642..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueEmptyMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724adb-4003-00b9-4903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724b04-4003-00b9-7103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f1339f74-d98e-4e9c-bfb7-b53cda993323</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAApySGWQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:38 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724b26-4003-00b9-1303-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f1339f74-d98e-4e9c-bfb7-b53cda993323</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:38 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:38 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText /></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724b3f-4003-00b9-2c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue85000300",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724b51-4003-00b9-3e03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  } ],
-  "variables" : [ "queue85000300" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueMessage.json
deleted file mode 100644
index 4be6f36d26c0..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d362-4003-00b9-1a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d37c-4003-00b9-3203-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f39a6db5-cb4a-4f70-be21-c72803c0253e</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAV6QtRANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071d393-4003-00b9-4903-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f39a6db5-cb4a-4f70-be21-c72803c0253e</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d3a6-4003-00b9-5c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue857326bc",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d3b4-4003-00b9-6a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  } ],
-  "variables" : [ "queue857326bc" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json
deleted file mode 100644
index 9859c91ffdb1..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueQueueDoesNotExist.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue50657bc8/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071d2c1-4003-00b9-8003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d2c1-4003-00b9-8003-47d378000000\nTime:2019-07-30T18:19:02.9379772Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue50657bc8/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071d2ea-4003-00b9-2703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d2ea-4003-00b9-2703-47d378000000\nTime:2019-07-30T18:19:02.9770131Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue50657bc8" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json
deleted file mode 100644
index 5c546664731c..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/enqueueShortTimeToLiveMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071be6d-4003-00b9-4a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f/messages?visibilitytimeout=0&messagettl=2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071be9d-4003-00b9-7603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f2a72af5-11f7-4174-9bca-0c6bbc7a1a4f</MessageId><InsertionTime>Tue, 30 Jul 2019 18:18:56 GMT</InsertionTime><ExpirationTime>Tue, 30 Jul 2019 18:18:58 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAl7hMQANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:18:56 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:18:56 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071cea8-4003-00b9-0e03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList />",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cec0-4003-00b9-2603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue4952015f",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071cee0-4003-00b9-4603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT"
-    }
-  } ],
-  "variables" : [ "queue4952015f" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json
deleted file mode 100644
index f51ee48724c7..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getAccessPolicyQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue066060ee?comp=acl",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8072468c-4003-00b9-2603-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8072468c-4003-00b9-2603-47d378000000\nTime:2019-07-30T18:19:37.6481654Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue066060ee/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "807246a7-4003-00b9-3f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:807246a7-4003-00b9-3f03-47d378000000\nTime:2019-07-30T18:19:37.6781928Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue066060ee" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json
deleted file mode 100644
index c81fadfa36f6..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getPropertiesQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue89138457?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071cf1e-4003-00b9-0203-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071cf1e-4003-00b9-0203-47d378000000\nTime:2019-07-30T18:19:01.8439650Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue89138457/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071cf3f-4003-00b9-2103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071cf3f-4003-00b9-2103-47d378000000\nTime:2019-07-30T18:19:01.8769939Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:01 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue89138457" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json
deleted file mode 100644
index 0f91979ead55..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/getQueueDoesNotCreateAQueue.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue881089d3/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "1cdd82f3-e003-0073-0f09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:1cdd82f3-e003-0073-0f09-4740b5000000\nTime:2019-07-30T19:01:06.9836664Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue881089d3&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd82f9-e003-0073-1409-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue881089d3</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue881089d3" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesIncludeMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesIncludeMetadata.json
deleted file mode 100644
index a3a8affdfea0..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesIncludeMetadata.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8362-e003-0073-6e09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8373-e003-0073-7b09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8378-e003-0073-7f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue3555933b&include=metadata&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd837b-e003-0073-0109-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue3555933b</Prefix><Queues><Queue><Name>queue3555933b0</Name><Metadata><metadata1>value1</metadata1><metadata2>value2</metadata2></Metadata></Queue><Queue><Name>queue3555933b1</Name><Metadata /></Queue><Queue><Name>queue3555933b2</Name><Metadata><metadata1>value1</metadata1><metadata2>value2</metadata2></Metadata></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue3555933b&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8382-e003-0073-0409-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue3555933b</Prefix><Queues><Queue><Name>queue3555933b0</Name></Queue><Queue><Name>queue3555933b1</Name></Queue><Queue><Name>queue3555933b2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b0/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd838a-e003-0073-0a09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd838d-e003-0073-0d09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b1/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8395-e003-0073-1409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd839b-e003-0073-1909-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd83a1-e003-0073-1f09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue3555933b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd83a4-e003-0073-2209-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:07 GMT"
-    }
-  } ],
-  "variables" : [ "queue3555933b" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithLimit.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithLimit.json
deleted file mode 100644
index fc87bcea2c77..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithLimit.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e780",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "4ab9e4e1-4003-00df-40f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e781",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "4ab9e592-4003-00df-55f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e782",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "4ab9e59c-4003-00df-5df2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue20354e78&maxresults=2&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "4ab9e5a9-4003-00df-66f2-4b6122000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue20354e78</Prefix><MaxResults>2</MaxResults><Queues><Queue><Name>queue20354e780</Name></Queue><Queue><Name>queue20354e781</Name></Queue></Queues><NextMarker>/azstoragesdkaccount/queue20354e782</NextMarker></EnumerationResults>",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue20354e78&marker=/azstoragesdkaccount/queue20354e782&maxresults=2&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "4ab9e5b3-4003-00df-6ff2-4b6122000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue20354e78</Prefix><Marker>/azstoragesdkaccount/queue20354e782</Marker><MaxResults>2</MaxResults><Queues><Queue><Name>queue20354e782</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue20354e78&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "4ab9e5b5-4003-00df-71f2-4b6122000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue20354e78</Prefix><Queues><Queue><Name>queue20354e780</Name></Queue><Queue><Name>queue20354e781</Name></Queue><Queue><Name>queue20354e782</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e780/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5bb-4003-00df-76f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:14 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e780",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5bd-4003-00df-78f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e781/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5d7-4003-00df-0df2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e781",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5d9-4003-00df-0ff2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e782/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5df-4003-00df-13f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue20354e782",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "4ab9e5e4-4003-00df-17f2-4b6122000000",
-      "Date" : "Tue, 06 Aug 2019 00:59:15 GMT"
-    }
-  } ],
-  "variables" : [ "queue20354e78" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithPrefix.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithPrefix.json
deleted file mode 100644
index 25ab0025e774..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/listQueuesWithPrefix.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8322-e003-0073-3709-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b51",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8329-e003-0073-3c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "1cdd8330-e003-0073-4109-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue360442b5prefix&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8334-e003-0073-4409-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue360442b5prefix</Prefix><Queues><Queue><Name>queue360442b5prefix0</Name></Queue><Queue><Name>queue360442b5prefix2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue360442b5&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd8337-e003-0073-4709-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue360442b5</Prefix><Queues><Queue><Name>queue360442b51</Name></Queue><Queue><Name>queue360442b5prefix0</Name></Queue><Queue><Name>queue360442b5prefix2</Name></Queue></Queues><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b51/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8339-e003-0073-4909-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b51",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd833c-e003-0073-4c09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix0/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd833f-e003-0073-4e09-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8343-e003-0073-5209-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8345-e003-0073-5409-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue360442b5prefix2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "1cdd8349-e003-0073-5709-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue360442b5" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMessage.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMessage.json
deleted file mode 100644
index dd793491431d..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMessage.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724592-4003-00b9-3103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "807245b2-4003-00b9-5003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4af8da31-fef8-48bb-9c58-e31cb39648bc</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:37 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAY9qQWANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "807245d1-4003-00b9-6f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>4af8da31-fef8-48bb-9c58-e31cb39648bc</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:37 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:37 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807245e5-4003-00b9-0303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue9289930b",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807245f8-4003-00b9-1603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  } ],
-  "variables" : [ "queue9289930b" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMultipleMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMultipleMessages.json
deleted file mode 100644
index ec67bb0d5044..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekMultipleMessages.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d3de-4003-00b9-1203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d3fe-4003-00b9-3103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>eb154178-fd28-4e7d-9bb4-502bd3aa9472</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAZNBKRANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d435-4003-00b9-6503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>c2697011-4b18-4aae-b894-92e681fe9af3</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAEZNWRANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:03 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages?numofmessages=2&peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071d45c-4003-00b9-0b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>eb154178-fd28-4e7d-9bb4-502bd3aa9472</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message</MessageText></QueueMessage><QueueMessage><MessageId>c2697011-4b18-4aae-b894-92e681fe9af3</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:03 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:03 GMT</ExpirationTime><DequeueCount>0</DequeueCount><MessageText>test message 2</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d478-4003-00b9-2703-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue17331e05",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d495-4003-00b9-4303-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT"
-    }
-  } ],
-  "variables" : [ "queue17331e05" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekQueueDoesNotExist.json
deleted file mode 100644
index 5efe773a0a36..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue163539f6/messages?peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071bbf5-4003-00b9-6403-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071bbf5-4003-00b9-6403-47d378000000\nTime:2019-07-30T18:18:55.9785249Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue163539f6/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071bc16-4003-00b9-0303-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071bc16-4003-00b9-0303-47d378000000\nTime:2019-07-30T18:18:56.0175608Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:18:55 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue163539f6" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekTooManyMessages.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekTooManyMessages.json
deleted file mode 100644
index 0e21d3f3e056..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/peekTooManyMessages.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724850-4003-00b9-5203-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2/messages?numofmessages=64&peekonly=true",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "OutOfRangeQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "456",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8072486a-4003-00b9-6b03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeQueryParameterValue</Code><Message>One of the query parameters specified in the request URI is outside the permissible range.\nRequestId:8072486a-4003-00b9-6b03-47d378000000\nTime:2019-07-30T18:19:38.2327064Z</Message><QueryParameterName>numofmessages</QueryParameterName><QueryParameterValue>64</QueryParameterValue><MinimumAllowed>1</MinimumAllowed><MaximumAllowed>32</MaximumAllowed></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724884-4003-00b9-0503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue007623b2",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "807248a6-4003-00b9-2603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:38 GMT"
-    }
-  } ],
-  "variables" : [ "queue007623b2" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidAccessPolicy.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidAccessPolicy.json
deleted file mode 100644
index c053664720a1..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidAccessPolicy.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724b93-4003-00b9-7c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0?comp=acl",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidXmlDocument",
-      "retry-after" : "0",
-      "Content-Length" : "371",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "80724bb2-4003-00b9-1a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:80724bb2-4003-00b9-1a03-47d378000000\nTime:2019-07-30T18:19:39.1915951Z</Message><LineNumber>1</LineNumber><LinePosition>304</LinePosition><Reason>Signed identifier ID cannot be empty or over 64 characters in length</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724bde-4003-00b9-4503-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue598515b0",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724bf9-4003-00b9-6003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  } ],
-  "variables" : [ "queue598515b0" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidMetadata.json
deleted file mode 100644
index 5e4a36f56436..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setInvalidMetadata.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071d01e-4003-00b9-7903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "EmptyMetadataKey",
-      "retry-after" : "0",
-      "Content-Length" : "285",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071d048-4003-00b9-2003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:8071d048-4003-00b9-2003-47d378000000\nTime:2019-07-30T18:19:02.1712670Z</Message><MetadataValue>bad metadata</MetadataValue></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d05e-4003-00b9-3603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue04921afb",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071d078-4003-00b9-5003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT"
-    }
-  } ],
-  "variables" : [ "queue04921afb" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadata.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadata.json
deleted file mode 100644
index 4f5b33d48612..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadata.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724c9b-4003-00b9-7c03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724cc8-4003-00b9-2803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "x-ms-approximate-messages-count" : "0",
-      "x-ms-meta-metadata1" : "value1",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "80724ce7-4003-00b9-4503-47d378000000",
-      "x-ms-meta-metadata2" : "value2",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724d0c-4003-00b9-6903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue228395ba",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724d24-4003-00b9-0103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:39 GMT"
-    }
-  } ],
-  "variables" : [ "queue228395ba" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json
deleted file mode 100644
index 2403d75b3cd8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setMetadataQueueDoesNotExist.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue1023979b?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "80724760-4003-00b9-7003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:80724760-4003-00b9-7003-47d378000000\nTime:2019-07-30T18:19:37.9564505Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue1023979b/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8072477f-4003-00b9-0d03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8072477f-4003-00b9-0d03-47d378000000\nTime:2019-07-30T18:19:37.9904825Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue1023979b" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setProperties.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setProperties.json
deleted file mode 100644
index 6788bd49edd8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setProperties.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81c0-e003-0073-8009-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1cdd81d5-e003-0073-1309-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81e5-e003-0073-1d09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1cdd81eb-e003-0073-2309-4740b5000000",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?restype=service&comp=properties",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81ed-e003-0073-2509-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net?prefix=queue30084080&include=&comp=list",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1cdd81f3-e003-0073-2b09-4740b5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://azstoragesdkaccount.queue.core.windows.net/\"><Prefix>queue30084080</Prefix><Queues /><NextMarker /></EnumerationResults>",
-      "Date" : "Tue, 30 Jul 2019 19:01:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue30084080" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setTooManyAccessPolicies.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/setTooManyAccessPolicies.json
deleted file mode 100644
index 52ffab91ef1e..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/setTooManyAccessPolicies.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "80724626-4003-00b9-4103-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a?comp=acl",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidXmlDocument",
-      "retry-after" : "0",
-      "Content-Length" : "294",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "80724645-4003-00b9-5f03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidXmlDocument</Code><Message>XML specified is not syntactically valid.\nRequestId:80724645-4003-00b9-5f03-47d378000000\nTime:2019-07-30T18:19:37.5430678Z</Message><LineNumber>0</LineNumber><LinePosition>0</LinePosition><Reason /></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8072465c-4003-00b9-7603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue02682f2a",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "80724670-4003-00b9-0a03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:37 GMT"
-    }
-  } ],
-  "variables" : [ "queue02682f2a" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidMessageId.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidMessageId.json
deleted file mode 100644
index 849ea36b90c2..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidMessageId.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dc01-4003-00b9-6903-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dc22-4003-00b9-0703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2d1bf643-019d-41da-8a3e-635dba5df867</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAtDTwRQNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071dc41-4003-00b9-2503-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>2d1bf643-019d-41da-8a3e-635dba5df867</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA6kHYVwNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:36 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages/2d1bf643-019d-41da-8a3e-635dba5df867random?popreceipt=AgAAAAMAAAAAAAAA6kHYVwNH1QE%3d&visibilitytimeout=1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "MessageNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "221",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071dc6d-4003-00b9-5003-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>MessageNotFound</Code><Message>The specified message does not exist.\nRequestId:8071dc6d-4003-00b9-5003-47d378000000\nTime:2019-07-30T18:19:06.1889942Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dc88-4003-00b9-6b03-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue70821c12",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071dca6-4003-00b9-0803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue70821c12" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json
deleted file mode 100644
index 960abdc79ba2..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageInvalidPopReceipt.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071ddb6-4003-00b9-0603-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "POST",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages?visibilitytimeout=0&messagettl=604800",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "8071dddf-4003-00b9-2d03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>af0f96cb-a19e-4f9a-b1ba-08e6c27944db</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAzks4RgNH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages?numofmessages=1&visibilitytimeout=30",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "Cache-Control" : "no-cache",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "8071ddf9-4003-00b9-4703-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>af0f96cb-a19e-4f9a-b1ba-08e6c27944db</MessageId><InsertionTime>Tue, 30 Jul 2019 18:19:06 GMT</InsertionTime><ExpirationTime>Tue, 06 Aug 2019 18:19:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA5KoeWANH1QE=</PopReceipt><TimeNextVisible>Tue, 30 Jul 2019 18:19:36 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test message</MessageText></QueueMessage></QueueMessagesList>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages/af0f96cb-a19e-4f9a-b1ba-08e6c27944db?popreceipt=AgAAAAMAAAAAAAAA5KoeWANH1QE%3drandom&visibilitytimeout=1",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "444",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071de13-4003-00b9-6103-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:8071de13-4003-00b9-6103-47d378000000\nTime:2019-07-30T18:19:06.6474193Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>AgAAAAMAAAAAAAAA5KoeWANH1QE=random</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071de2b-4003-00b9-7803-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue12446d02",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "204",
-      "x-ms-request-id" : "8071de43-4003-00b9-1003-47d378000000",
-      "Date" : "Tue, 30 Jul 2019 18:19:06 GMT"
-    }
-  } ],
-  "variables" : [ "queue12446d02" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json
deleted file mode 100644
index b87cef21fed8..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/updateMessageQueueDoesNotExist.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue960895d5/messages/doesn't?popreceipt=exist&visibilitytimeout=5",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0",
-      "Content-Type" : "application/xml; charset=utf-8"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidQueryParameterValue",
-      "retry-after" : "0",
-      "Content-Length" : "415",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "8071d32f-4003-00b9-6803-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidQueryParameterValue</Code><Message>Value for one of the query parameters specified in the request URI is invalid.\nRequestId:8071d32f-4003-00b9-6803-47d378000000\nTime:2019-07-30T18:19:03.0460773Z</Message><QueryParameterName>popreceipt</QueryParameterName><QueryParameterValue>exist</QueryParameterValue><Reason>Invalid pop receipt format</Reason></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:02 GMT",
-      "Content-Type" : "application/xml"
-    }
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queue960895d5/messages",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "QueueNotFound",
-      "retry-after" : "0",
-      "Content-Length" : "217",
-      "StatusCode" : "404",
-      "x-ms-request-id" : "8071d341-4003-00b9-7a03-47d378000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>QueueNotFound</Code><Message>The specified queue does not exist.\nRequestId:8071d341-4003-00b9-7a03-47d378000000\nTime:2019-07-30T18:19:03.0771058Z</Message></Error>",
-      "Date" : "Tue, 30 Jul 2019 18:19:03 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "queue960895d5" ]
-}
\ No newline at end of file

From 9bea3e20ce703a3bd1b9005c306b99fa9f8ef113 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Thu, 15 Aug 2019 17:27:31 -0700
Subject: [PATCH 18/22] Fix directory path. (#5012)

---
 pom.data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.data.xml b/pom.data.xml
index b29bea93bc9d..c4f136e43183 100644
--- a/pom.data.xml
+++ b/pom.data.xml
@@ -545,7 +545,7 @@
     <module>./sdk/cosmos</module>
     <module>./sdk/eventhubs/pom.data.xml</module>
     <module>./sdk/keyvault/pom.data.xml</module>
-    <module>./sdk/servicebus/azure-servicebus</module>
+    <module>./sdk/servicebus/microsoft-azure-servicebus</module>
     <module>./sdk/storage/microsoft-azure-storage-blob</module>
   </modules>
 </project>

From 7ff66306b12ab9cf9c837414843334ee836e69de Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2019 05:35:18 +0000
Subject: [PATCH 19/22] Generated from 368b5914a375e09ef413285c932b72038a8af7e4
 (#4731)

fix: sql preview model validation errors

- Remove empty "body" for RESPONSE_SCHEMA_NOT_IN_SPEC errors
- IsAzureMonitorTargetEnabled -> isAzureMonitorTargetEnabled
- "State" -> "state"
- emailAccountAdmins "true" -> true
- Add 202 response for RestorePoints_Create
- password -> certPassword for ManagedInstanceTdeCertificates_Create and TdeCertificates_Create
---
 .../v2017_10_01_preview/pom.xml               |   4 +-
 .../sql/v2017_10_01_preview/Database.java     |  71 +++-
 .../v2017_10_01_preview/DatabaseStatus.java   |   6 +
 .../v2017_10_01_preview/DatabaseUpdate.java   |  59 ++-
 .../sql/v2017_10_01_preview/ElasticPool.java  |   6 +-
 .../RecoverableManagedDatabase.java           |  42 ++
 .../RecoverableManagedDatabases.java          |  40 ++
 .../implementation/DatabaseImpl.java          |  30 ++
 .../implementation/DatabaseInner.java         |  92 +++-
 ...lnerabilityAssessmentRuleBaselineImpl.java |   4 +-
 .../implementation/ElasticPoolInner.java      |  23 +-
 ...nerabilityAssessmentRuleBaselinesImpl.java |   3 +-
 .../RecoverableManagedDatabaseImpl.java       |  63 +++
 .../RecoverableManagedDatabaseInner.java      |  35 ++
 .../RecoverableManagedDatabasesImpl.java      |  65 +++
 .../RecoverableManagedDatabasesInner.java     | 401 ++++++++++++++++++
 .../SqlManagementClientImpl.java              |  14 +
 .../implementation/SqlManager.java            |  12 +
 18 files changed, 950 insertions(+), 20 deletions(-)
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java

diff --git a/sql/resource-manager/v2017_10_01_preview/pom.xml b/sql/resource-manager/v2017_10_01_preview/pom.xml
index db97895f8b5c..99b5452880c0 100644
--- a/sql/resource-manager/v2017_10_01_preview/pom.xml
+++ b/sql/resource-manager/v2017_10_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
index 966ec7467b22..1032f3897e2b 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
@@ -25,6 +25,11 @@
  * Type representing Database.
  */
 public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<SqlManager> {
+    /**
+     * @return the autoPauseDelay value.
+     */
+    Integer autoPauseDelay();
+
     /**
      * @return the catalogCollation value.
      */
@@ -120,6 +125,11 @@ public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshabl
      */
     Long maxSizeBytes();
 
+    /**
+     * @return the minCapacity value.
+     */
+    Double minCapacity();
+
     /**
      * @return the name value.
      */
@@ -236,6 +246,18 @@ interface WithLocation {
             WithCreate withLocation(String location);
         }
 
+        /**
+         * The stage of the database definition allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next definition stage
+             */
+            WithCreate withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database definition allowing to specify CatalogCollation.
          */
@@ -328,6 +350,18 @@ interface WithMaxSizeBytes {
             WithCreate withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database definition allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next definition stage
+             */
+            WithCreate withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database definition allowing to specify ReadScale.
          */
@@ -406,7 +440,14 @@ interface WithSampleName {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The name and tier of the SKU
+             * @param sku The database SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+ ```azurecli
+ az sql db list-editions -l &lt;location&gt; -o table
+ ````
+ ```powershell
+ Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
@@ -465,19 +506,31 @@ interface WithZoneRedundant {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<Database>, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
+        interface WithCreate extends Creatable<Database>, DefinitionStages.WithAutoPauseDelay, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithMinCapacity, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
         }
     }
     /**
      * The template for a Database update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Database>, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
+    interface Update extends Appliable<Database>, UpdateStages.WithAutoPauseDelay, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithMinCapacity, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
     }
 
     /**
      * Grouping of Database update stages.
      */
     interface UpdateStages {
+        /**
+         * The stage of the database update allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next update stage
+             */
+            Update withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database update allowing to specify CatalogCollation.
          */
@@ -570,6 +623,18 @@ interface WithMaxSizeBytes {
             Update withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database update allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next update stage
+             */
+            Update withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database update allowing to specify ReadScale.
          */
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
index 9f978f320c7d..3fb2f98287b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
@@ -70,6 +70,12 @@ public final class DatabaseStatus extends ExpandableStringEnum<DatabaseStatus> {
     /** Static value Scaling for DatabaseStatus. */
     public static final DatabaseStatus SCALING = fromString("Scaling");
 
+    /** Static value OfflineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus OFFLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OfflineChangingDwPerformanceTiers");
+
+    /** Static value OnlineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus ONLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OnlineChangingDwPerformanceTiers");
+
     /**
      * Creates or finds a DatabaseStatus from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
index eafe8ef45060..ac090462a514 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
@@ -106,7 +106,8 @@ public class DatabaseUpdate {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -237,6 +238,20 @@ public class DatabaseUpdate {
     @JsonProperty(value = "properties.currentSku", access = JsonProperty.Access.WRITE_ONLY)
     private Sku currentSku;
 
+    /**
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
     /**
      * Resource tags.
      */
@@ -400,7 +415,7 @@ public DatabaseUpdate withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -689,6 +704,46 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
     /**
      * Get resource tags.
      *
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
index c7b12d377c52..fa4d492b98f7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
@@ -172,7 +172,11 @@ interface WithPerDatabaseSettings {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku the sku parameter value
+             * @param sku The elastic pool SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+ ```azurecli
+ az sql elastic-pool list-editions -l &lt;location&gt; -o table
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
new file mode 100644
index 000000000000..eca31ea91304
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.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.sql.v2017_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabaseInner;
+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.sql.v2017_10_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing RecoverableManagedDatabase.
+ */
+public interface RecoverableManagedDatabase extends HasInner<RecoverableManagedDatabaseInner>, Indexable, Refreshable<RecoverableManagedDatabase>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the lastAvailableBackupDate value.
+     */
+    String lastAvailableBackupDate();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
new file mode 100644
index 000000000000..c73338b1d549
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.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.sql.v2017_10_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabasesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RecoverableManagedDatabases.
+ */
+public interface RecoverableManagedDatabases extends HasInner<RecoverableManagedDatabasesInner> {
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName);
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
index 57538e6de24c..821c2b33747f 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
@@ -101,6 +101,11 @@ private void resetCreateUpdateParameters() {
         this.updateParameter = new DatabaseUpdate();
     }
 
+    @Override
+    public Integer autoPauseDelay() {
+        return this.inner().autoPauseDelay();
+    }
+
     @Override
     public CatalogCollationType catalogCollation() {
         return this.inner().catalogCollation();
@@ -196,6 +201,11 @@ public Long maxSizeBytes() {
         return this.inner().maxSizeBytes();
     }
 
+    @Override
+    public Double minCapacity() {
+        return this.inner().minCapacity();
+    }
+
     @Override
     public String name() {
         return this.inner().name();
@@ -284,6 +294,16 @@ public DatabaseImpl withLocation(String location) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withAutoPauseDelay(Integer autoPauseDelay) {
+        if (isInCreateMode()) {
+            this.inner().withAutoPauseDelay(autoPauseDelay);
+        } else {
+            this.updateParameter.withAutoPauseDelay(autoPauseDelay);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withCatalogCollation(CatalogCollationType catalogCollation) {
         if (isInCreateMode()) {
@@ -354,6 +374,16 @@ public DatabaseImpl withMaxSizeBytes(Long maxSizeBytes) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withMinCapacity(Double minCapacity) {
+        if (isInCreateMode()) {
+            this.inner().withMinCapacity(minCapacity);
+        } else {
+            this.updateParameter.withMinCapacity(minCapacity);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withReadScale(DatabaseReadScale readScale) {
         if (isInCreateMode()) {
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
index 9c0e11f49b7f..d9598a583582 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
@@ -27,7 +27,20 @@
 @JsonFlatten
 public class DatabaseInner extends Resource {
     /**
-     * The name and tier of the SKU.
+     * The database SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -125,7 +138,8 @@ public class DatabaseInner extends Resource {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -257,7 +271,28 @@ public class DatabaseInner extends Resource {
     private Sku currentSku;
 
     /**
-     * Get the name and tier of the SKU.
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
+    /**
+     * Get the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @return the sku value
      */
@@ -266,7 +301,14 @@ public Sku sku() {
     }
 
     /**
-     * Set the name and tier of the SKU.
+     * Set the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @param sku the sku value to set
      * @return the DatabaseInner object itself.
@@ -431,7 +473,7 @@ public DatabaseInner withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -720,4 +762,44 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
 }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
index cdae43ef347f..7c4b03e3bda7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
@@ -29,7 +29,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(name, new DatabaseVulnerabilityAssessmentRuleBaselineInner());
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(name);
+        this.baselineName = name;
         //
     }
 
@@ -37,7 +37,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(inner.name());
+        this.baselineName = inner.name();
         // set resource ancestor and positional variables
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
index e7e1135945e9..d5a449ff60bd 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
@@ -23,7 +23,16 @@
 @JsonFlatten
 public class ElasticPoolInner extends Resource {
     /**
-     * The sku property.
+     * The elastic pool SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or the following command:
+     *
+     * ```azurecli
+     * az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -76,7 +85,11 @@ public class ElasticPoolInner extends Resource {
     private ElasticPoolLicenseType licenseType;
 
     /**
-     * Get the sku value.
+     * Get the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @return the sku value
      */
@@ -85,7 +98,11 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @param sku the sku value to set
      * @return the ElasticPoolInner object itself.
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
index 7b7f4ee69543..251a0a223bfc 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
@@ -11,7 +11,6 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedDatabaseVulnerabilityAssessmentRuleBaselines;
-import com.microsoft.azure.management.sql.v2017_10_01_preview.VulnerabilityAssessmentPolicyBaselineName;
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.DatabaseVulnerabilityAssessmentRuleBaseline;
@@ -47,7 +46,7 @@ private Observable<DatabaseVulnerabilityAssessmentRuleBaselineInner> getDatabase
         String managedInstanceName = IdParsingUtils.getValueFromIdByName(id, "managedInstances");
         String databaseName = IdParsingUtils.getValueFromIdByName(id, "databases");
         String ruleId = IdParsingUtils.getValueFromIdByName(id, "rules");
-        VulnerabilityAssessmentPolicyBaselineName baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
+        String baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
         ManagedDatabaseVulnerabilityAssessmentRuleBaselinesInner client = this.inner();
         return client.getAsync(resourceGroupName, managedInstanceName, databaseName, ruleId, baselineName);
     }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
new file mode 100644
index 000000000000..9dbd7757bdf5
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.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.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+
+class RecoverableManagedDatabaseImpl extends IndexableRefreshableWrapperImpl<RecoverableManagedDatabase, RecoverableManagedDatabaseInner> implements RecoverableManagedDatabase {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String recoverableDatabaseName;
+
+    RecoverableManagedDatabaseImpl(RecoverableManagedDatabaseInner inner,  SqlManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.recoverableDatabaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "recoverableDatabases");
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<RecoverableManagedDatabaseInner> getInnerAsync() {
+        RecoverableManagedDatabasesInner client = this.manager().inner().recoverableManagedDatabases();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.recoverableDatabaseName);
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String lastAvailableBackupDate() {
+        return this.inner().lastAvailableBackupDate();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
new file mode 100644
index 000000000000..08d0cf8784a1
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.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.sql.v2017_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A recoverable managed database resource.
+ */
+@JsonFlatten
+public class RecoverableManagedDatabaseInner extends ProxyResource {
+    /**
+     * The last available backup date.
+     */
+    @JsonProperty(value = "properties.lastAvailableBackupDate", access = JsonProperty.Access.WRITE_ONLY)
+    private String lastAvailableBackupDate;
+
+    /**
+     * Get the last available backup date.
+     *
+     * @return the lastAvailableBackupDate value
+     */
+    public String lastAvailableBackupDate() {
+        return this.lastAvailableBackupDate;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
new file mode 100644
index 000000000000..119953c77ec6
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+
+class RecoverableManagedDatabasesImpl extends WrapperImpl<RecoverableManagedDatabasesInner> implements RecoverableManagedDatabases {
+    private final SqlManager manager;
+
+    RecoverableManagedDatabasesImpl(SqlManager manager) {
+        super(manager.inner().recoverableManagedDatabases());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    private RecoverableManagedDatabaseImpl wrapModel(RecoverableManagedDatabaseInner inner) {
+        return  new RecoverableManagedDatabaseImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<RecoverableManagedDatabaseInner>, Iterable<RecoverableManagedDatabaseInner>>() {
+            @Override
+            public Iterable<RecoverableManagedDatabaseInner> call(Page<RecoverableManagedDatabaseInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName)
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
new file mode 100644
index 000000000000..741eb5979e22
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
@@ -0,0 +1,401 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.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 RecoverableManagedDatabases.
+ */
+public class RecoverableManagedDatabasesInner {
+    /** The Retrofit service to perform REST calls. */
+    private RecoverableManagedDatabasesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RecoverableManagedDatabasesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RecoverableManagedDatabasesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(RecoverableManagedDatabasesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RecoverableManagedDatabases to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RecoverableManagedDatabasesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases/{recoverableDatabaseName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("recoverableDatabaseName") String recoverableDatabaseName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName 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.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RecoverableManagedDatabaseInner object if successful.
+     */
+    public RecoverableManagedDatabaseInner get(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName, final ServiceCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName), serviceCallback);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).map(new Func1<ServiceResponse<RecoverableManagedDatabaseInner>, RecoverableManagedDatabaseInner>() {
+            @Override
+            public RecoverableManagedDatabaseInner call(ServiceResponse<RecoverableManagedDatabaseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (recoverableDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter recoverableDatabaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(resourceGroupName, managedInstanceName, recoverableDatabaseName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RecoverableManagedDatabaseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RecoverableManagedDatabaseInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RecoverableManagedDatabaseInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RecoverableManagedDatabaseInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RecoverableManagedDatabaseInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<RecoverableManagedDatabaseInner>> serviceFuture, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextSinglePageAsync(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.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
index d32e61c6610d..ad2a3c376e69 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
@@ -327,6 +327,19 @@ public ManagedInstanceEncryptionProtectorsInner managedInstanceEncryptionProtect
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * The RecoverableManagedDatabasesInner object to access its operations.
+     */
+    private RecoverableManagedDatabasesInner recoverableManagedDatabases;
+
+    /**
+     * Gets the RecoverableManagedDatabasesInner object to access its operations.
+     * @return the RecoverableManagedDatabasesInner object.
+     */
+    public RecoverableManagedDatabasesInner recoverableManagedDatabases() {
+        return this.recoverableManagedDatabases;
+    }
+
     /**
      * Initializes an instance of SqlManagementClient client.
      *
@@ -377,6 +390,7 @@ protected void initialize() {
         this.managedInstanceTdeCertificates = new ManagedInstanceTdeCertificatesInner(restClient().retrofit(), this);
         this.managedInstanceKeys = new ManagedInstanceKeysInner(restClient().retrofit(), this);
         this.managedInstanceEncryptionProtectors = new ManagedInstanceEncryptionProtectorsInner(restClient().retrofit(), this);
+        this.recoverableManagedDatabases = new RecoverableManagedDatabasesInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
     }
 
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
index f76a2962112b..aeddeb2596b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
@@ -31,6 +31,7 @@
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceTdeCertificates;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
@@ -53,6 +54,7 @@ public final class SqlManager extends ManagerCore<SqlManager, SqlManagementClien
     private ManagedInstanceTdeCertificates managedInstanceTdeCertificates;
     private ManagedInstanceKeys managedInstanceKeys;
     private ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors;
+    private RecoverableManagedDatabases recoverableManagedDatabases;
     /**
     * Get a Configurable instance that can be used to create SqlManager with optional configuration.
     *
@@ -250,6 +252,16 @@ public ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors()
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * @return Entry point to manage RecoverableManagedDatabases.
+     */
+    public RecoverableManagedDatabases recoverableManagedDatabases() {
+        if (this.recoverableManagedDatabases == null) {
+            this.recoverableManagedDatabases = new RecoverableManagedDatabasesImpl(this);
+        }
+        return this.recoverableManagedDatabases;
+    }
+
     /**
     * The implementation for Configurable interface.
     */

From 32dc64a4608ad93ce416acb6b05b1a69d4e2d124 Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2019 05:35:18 +0000
Subject: [PATCH 20/22] Generated from 368b5914a375e09ef413285c932b72038a8af7e4
 (#4731)

fix: sql preview model validation errors

- Remove empty "body" for RESPONSE_SCHEMA_NOT_IN_SPEC errors
- IsAzureMonitorTargetEnabled -> isAzureMonitorTargetEnabled
- "State" -> "state"
- emailAccountAdmins "true" -> true
- Add 202 response for RestorePoints_Create
- password -> certPassword for ManagedInstanceTdeCertificates_Create and TdeCertificates_Create
---
 .../v2017_10_01_preview/pom.xml               |   4 +-
 .../sql/v2017_10_01_preview/Database.java     |  71 +++-
 .../v2017_10_01_preview/DatabaseStatus.java   |   6 +
 .../v2017_10_01_preview/DatabaseUpdate.java   |  59 ++-
 .../sql/v2017_10_01_preview/ElasticPool.java  |   6 +-
 .../RecoverableManagedDatabase.java           |  42 ++
 .../RecoverableManagedDatabases.java          |  40 ++
 .../implementation/DatabaseImpl.java          |  30 ++
 .../implementation/DatabaseInner.java         |  92 +++-
 ...lnerabilityAssessmentRuleBaselineImpl.java |   4 +-
 .../implementation/ElasticPoolInner.java      |  23 +-
 ...nerabilityAssessmentRuleBaselinesImpl.java |   3 +-
 .../RecoverableManagedDatabaseImpl.java       |  63 +++
 .../RecoverableManagedDatabaseInner.java      |  35 ++
 .../RecoverableManagedDatabasesImpl.java      |  65 +++
 .../RecoverableManagedDatabasesInner.java     | 401 ++++++++++++++++++
 .../SqlManagementClientImpl.java              |  14 +
 .../implementation/SqlManager.java            |  12 +
 18 files changed, 950 insertions(+), 20 deletions(-)
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java

diff --git a/sql/resource-manager/v2017_10_01_preview/pom.xml b/sql/resource-manager/v2017_10_01_preview/pom.xml
index db97895f8b5c..99b5452880c0 100644
--- a/sql/resource-manager/v2017_10_01_preview/pom.xml
+++ b/sql/resource-manager/v2017_10_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
index 966ec7467b22..1032f3897e2b 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
@@ -25,6 +25,11 @@
  * Type representing Database.
  */
 public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<SqlManager> {
+    /**
+     * @return the autoPauseDelay value.
+     */
+    Integer autoPauseDelay();
+
     /**
      * @return the catalogCollation value.
      */
@@ -120,6 +125,11 @@ public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshabl
      */
     Long maxSizeBytes();
 
+    /**
+     * @return the minCapacity value.
+     */
+    Double minCapacity();
+
     /**
      * @return the name value.
      */
@@ -236,6 +246,18 @@ interface WithLocation {
             WithCreate withLocation(String location);
         }
 
+        /**
+         * The stage of the database definition allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next definition stage
+             */
+            WithCreate withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database definition allowing to specify CatalogCollation.
          */
@@ -328,6 +350,18 @@ interface WithMaxSizeBytes {
             WithCreate withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database definition allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next definition stage
+             */
+            WithCreate withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database definition allowing to specify ReadScale.
          */
@@ -406,7 +440,14 @@ interface WithSampleName {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The name and tier of the SKU
+             * @param sku The database SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+ ```azurecli
+ az sql db list-editions -l &lt;location&gt; -o table
+ ````
+ ```powershell
+ Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
@@ -465,19 +506,31 @@ interface WithZoneRedundant {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<Database>, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
+        interface WithCreate extends Creatable<Database>, DefinitionStages.WithAutoPauseDelay, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithMinCapacity, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
         }
     }
     /**
      * The template for a Database update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Database>, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
+    interface Update extends Appliable<Database>, UpdateStages.WithAutoPauseDelay, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithMinCapacity, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
     }
 
     /**
      * Grouping of Database update stages.
      */
     interface UpdateStages {
+        /**
+         * The stage of the database update allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next update stage
+             */
+            Update withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database update allowing to specify CatalogCollation.
          */
@@ -570,6 +623,18 @@ interface WithMaxSizeBytes {
             Update withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database update allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next update stage
+             */
+            Update withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database update allowing to specify ReadScale.
          */
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
index 9f978f320c7d..3fb2f98287b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
@@ -70,6 +70,12 @@ public final class DatabaseStatus extends ExpandableStringEnum<DatabaseStatus> {
     /** Static value Scaling for DatabaseStatus. */
     public static final DatabaseStatus SCALING = fromString("Scaling");
 
+    /** Static value OfflineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus OFFLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OfflineChangingDwPerformanceTiers");
+
+    /** Static value OnlineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus ONLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OnlineChangingDwPerformanceTiers");
+
     /**
      * Creates or finds a DatabaseStatus from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
index eafe8ef45060..ac090462a514 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
@@ -106,7 +106,8 @@ public class DatabaseUpdate {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -237,6 +238,20 @@ public class DatabaseUpdate {
     @JsonProperty(value = "properties.currentSku", access = JsonProperty.Access.WRITE_ONLY)
     private Sku currentSku;
 
+    /**
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
     /**
      * Resource tags.
      */
@@ -400,7 +415,7 @@ public DatabaseUpdate withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -689,6 +704,46 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
     /**
      * Get resource tags.
      *
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
index c7b12d377c52..fa4d492b98f7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
@@ -172,7 +172,11 @@ interface WithPerDatabaseSettings {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku the sku parameter value
+             * @param sku The elastic pool SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+ ```azurecli
+ az sql elastic-pool list-editions -l &lt;location&gt; -o table
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
new file mode 100644
index 000000000000..eca31ea91304
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.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.sql.v2017_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabaseInner;
+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.sql.v2017_10_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing RecoverableManagedDatabase.
+ */
+public interface RecoverableManagedDatabase extends HasInner<RecoverableManagedDatabaseInner>, Indexable, Refreshable<RecoverableManagedDatabase>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the lastAvailableBackupDate value.
+     */
+    String lastAvailableBackupDate();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
new file mode 100644
index 000000000000..c73338b1d549
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.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.sql.v2017_10_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabasesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RecoverableManagedDatabases.
+ */
+public interface RecoverableManagedDatabases extends HasInner<RecoverableManagedDatabasesInner> {
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName);
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
index 57538e6de24c..821c2b33747f 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
@@ -101,6 +101,11 @@ private void resetCreateUpdateParameters() {
         this.updateParameter = new DatabaseUpdate();
     }
 
+    @Override
+    public Integer autoPauseDelay() {
+        return this.inner().autoPauseDelay();
+    }
+
     @Override
     public CatalogCollationType catalogCollation() {
         return this.inner().catalogCollation();
@@ -196,6 +201,11 @@ public Long maxSizeBytes() {
         return this.inner().maxSizeBytes();
     }
 
+    @Override
+    public Double minCapacity() {
+        return this.inner().minCapacity();
+    }
+
     @Override
     public String name() {
         return this.inner().name();
@@ -284,6 +294,16 @@ public DatabaseImpl withLocation(String location) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withAutoPauseDelay(Integer autoPauseDelay) {
+        if (isInCreateMode()) {
+            this.inner().withAutoPauseDelay(autoPauseDelay);
+        } else {
+            this.updateParameter.withAutoPauseDelay(autoPauseDelay);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withCatalogCollation(CatalogCollationType catalogCollation) {
         if (isInCreateMode()) {
@@ -354,6 +374,16 @@ public DatabaseImpl withMaxSizeBytes(Long maxSizeBytes) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withMinCapacity(Double minCapacity) {
+        if (isInCreateMode()) {
+            this.inner().withMinCapacity(minCapacity);
+        } else {
+            this.updateParameter.withMinCapacity(minCapacity);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withReadScale(DatabaseReadScale readScale) {
         if (isInCreateMode()) {
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
index 9c0e11f49b7f..d9598a583582 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
@@ -27,7 +27,20 @@
 @JsonFlatten
 public class DatabaseInner extends Resource {
     /**
-     * The name and tier of the SKU.
+     * The database SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -125,7 +138,8 @@ public class DatabaseInner extends Resource {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -257,7 +271,28 @@ public class DatabaseInner extends Resource {
     private Sku currentSku;
 
     /**
-     * Get the name and tier of the SKU.
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
+    /**
+     * Get the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @return the sku value
      */
@@ -266,7 +301,14 @@ public Sku sku() {
     }
 
     /**
-     * Set the name and tier of the SKU.
+     * Set the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @param sku the sku value to set
      * @return the DatabaseInner object itself.
@@ -431,7 +473,7 @@ public DatabaseInner withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -720,4 +762,44 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
 }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
index cdae43ef347f..7c4b03e3bda7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
@@ -29,7 +29,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(name, new DatabaseVulnerabilityAssessmentRuleBaselineInner());
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(name);
+        this.baselineName = name;
         //
     }
 
@@ -37,7 +37,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(inner.name());
+        this.baselineName = inner.name();
         // set resource ancestor and positional variables
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
index e7e1135945e9..d5a449ff60bd 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
@@ -23,7 +23,16 @@
 @JsonFlatten
 public class ElasticPoolInner extends Resource {
     /**
-     * The sku property.
+     * The elastic pool SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or the following command:
+     *
+     * ```azurecli
+     * az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -76,7 +85,11 @@ public class ElasticPoolInner extends Resource {
     private ElasticPoolLicenseType licenseType;
 
     /**
-     * Get the sku value.
+     * Get the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @return the sku value
      */
@@ -85,7 +98,11 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @param sku the sku value to set
      * @return the ElasticPoolInner object itself.
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
index 7b7f4ee69543..251a0a223bfc 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
@@ -11,7 +11,6 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedDatabaseVulnerabilityAssessmentRuleBaselines;
-import com.microsoft.azure.management.sql.v2017_10_01_preview.VulnerabilityAssessmentPolicyBaselineName;
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.DatabaseVulnerabilityAssessmentRuleBaseline;
@@ -47,7 +46,7 @@ private Observable<DatabaseVulnerabilityAssessmentRuleBaselineInner> getDatabase
         String managedInstanceName = IdParsingUtils.getValueFromIdByName(id, "managedInstances");
         String databaseName = IdParsingUtils.getValueFromIdByName(id, "databases");
         String ruleId = IdParsingUtils.getValueFromIdByName(id, "rules");
-        VulnerabilityAssessmentPolicyBaselineName baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
+        String baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
         ManagedDatabaseVulnerabilityAssessmentRuleBaselinesInner client = this.inner();
         return client.getAsync(resourceGroupName, managedInstanceName, databaseName, ruleId, baselineName);
     }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
new file mode 100644
index 000000000000..9dbd7757bdf5
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.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.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+
+class RecoverableManagedDatabaseImpl extends IndexableRefreshableWrapperImpl<RecoverableManagedDatabase, RecoverableManagedDatabaseInner> implements RecoverableManagedDatabase {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String recoverableDatabaseName;
+
+    RecoverableManagedDatabaseImpl(RecoverableManagedDatabaseInner inner,  SqlManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.recoverableDatabaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "recoverableDatabases");
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<RecoverableManagedDatabaseInner> getInnerAsync() {
+        RecoverableManagedDatabasesInner client = this.manager().inner().recoverableManagedDatabases();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.recoverableDatabaseName);
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String lastAvailableBackupDate() {
+        return this.inner().lastAvailableBackupDate();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
new file mode 100644
index 000000000000..08d0cf8784a1
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.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.sql.v2017_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A recoverable managed database resource.
+ */
+@JsonFlatten
+public class RecoverableManagedDatabaseInner extends ProxyResource {
+    /**
+     * The last available backup date.
+     */
+    @JsonProperty(value = "properties.lastAvailableBackupDate", access = JsonProperty.Access.WRITE_ONLY)
+    private String lastAvailableBackupDate;
+
+    /**
+     * Get the last available backup date.
+     *
+     * @return the lastAvailableBackupDate value
+     */
+    public String lastAvailableBackupDate() {
+        return this.lastAvailableBackupDate;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
new file mode 100644
index 000000000000..119953c77ec6
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+
+class RecoverableManagedDatabasesImpl extends WrapperImpl<RecoverableManagedDatabasesInner> implements RecoverableManagedDatabases {
+    private final SqlManager manager;
+
+    RecoverableManagedDatabasesImpl(SqlManager manager) {
+        super(manager.inner().recoverableManagedDatabases());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    private RecoverableManagedDatabaseImpl wrapModel(RecoverableManagedDatabaseInner inner) {
+        return  new RecoverableManagedDatabaseImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<RecoverableManagedDatabaseInner>, Iterable<RecoverableManagedDatabaseInner>>() {
+            @Override
+            public Iterable<RecoverableManagedDatabaseInner> call(Page<RecoverableManagedDatabaseInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName)
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
new file mode 100644
index 000000000000..741eb5979e22
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
@@ -0,0 +1,401 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.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 RecoverableManagedDatabases.
+ */
+public class RecoverableManagedDatabasesInner {
+    /** The Retrofit service to perform REST calls. */
+    private RecoverableManagedDatabasesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RecoverableManagedDatabasesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RecoverableManagedDatabasesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(RecoverableManagedDatabasesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RecoverableManagedDatabases to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RecoverableManagedDatabasesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases/{recoverableDatabaseName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("recoverableDatabaseName") String recoverableDatabaseName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName 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.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RecoverableManagedDatabaseInner object if successful.
+     */
+    public RecoverableManagedDatabaseInner get(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName, final ServiceCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName), serviceCallback);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).map(new Func1<ServiceResponse<RecoverableManagedDatabaseInner>, RecoverableManagedDatabaseInner>() {
+            @Override
+            public RecoverableManagedDatabaseInner call(ServiceResponse<RecoverableManagedDatabaseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (recoverableDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter recoverableDatabaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(resourceGroupName, managedInstanceName, recoverableDatabaseName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RecoverableManagedDatabaseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RecoverableManagedDatabaseInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RecoverableManagedDatabaseInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RecoverableManagedDatabaseInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RecoverableManagedDatabaseInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<RecoverableManagedDatabaseInner>> serviceFuture, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextSinglePageAsync(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.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
index d32e61c6610d..ad2a3c376e69 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
@@ -327,6 +327,19 @@ public ManagedInstanceEncryptionProtectorsInner managedInstanceEncryptionProtect
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * The RecoverableManagedDatabasesInner object to access its operations.
+     */
+    private RecoverableManagedDatabasesInner recoverableManagedDatabases;
+
+    /**
+     * Gets the RecoverableManagedDatabasesInner object to access its operations.
+     * @return the RecoverableManagedDatabasesInner object.
+     */
+    public RecoverableManagedDatabasesInner recoverableManagedDatabases() {
+        return this.recoverableManagedDatabases;
+    }
+
     /**
      * Initializes an instance of SqlManagementClient client.
      *
@@ -377,6 +390,7 @@ protected void initialize() {
         this.managedInstanceTdeCertificates = new ManagedInstanceTdeCertificatesInner(restClient().retrofit(), this);
         this.managedInstanceKeys = new ManagedInstanceKeysInner(restClient().retrofit(), this);
         this.managedInstanceEncryptionProtectors = new ManagedInstanceEncryptionProtectorsInner(restClient().retrofit(), this);
+        this.recoverableManagedDatabases = new RecoverableManagedDatabasesInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
     }
 
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
index f76a2962112b..aeddeb2596b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
@@ -31,6 +31,7 @@
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceTdeCertificates;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
@@ -53,6 +54,7 @@ public final class SqlManager extends ManagerCore<SqlManager, SqlManagementClien
     private ManagedInstanceTdeCertificates managedInstanceTdeCertificates;
     private ManagedInstanceKeys managedInstanceKeys;
     private ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors;
+    private RecoverableManagedDatabases recoverableManagedDatabases;
     /**
     * Get a Configurable instance that can be used to create SqlManager with optional configuration.
     *
@@ -250,6 +252,16 @@ public ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors()
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * @return Entry point to manage RecoverableManagedDatabases.
+     */
+    public RecoverableManagedDatabases recoverableManagedDatabases() {
+        if (this.recoverableManagedDatabases == null) {
+            this.recoverableManagedDatabases = new RecoverableManagedDatabasesImpl(this);
+        }
+        return this.recoverableManagedDatabases;
+    }
+
     /**
     * The implementation for Configurable interface.
     */

From 6879a24abb90e4f453326b2d3daebb5e4ba1d99a Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2019 05:35:18 +0000
Subject: [PATCH 21/22] Generated from 368b5914a375e09ef413285c932b72038a8af7e4
 (#4731)

fix: sql preview model validation errors

- Remove empty "body" for RESPONSE_SCHEMA_NOT_IN_SPEC errors
- IsAzureMonitorTargetEnabled -> isAzureMonitorTargetEnabled
- "State" -> "state"
- emailAccountAdmins "true" -> true
- Add 202 response for RestorePoints_Create
- password -> certPassword for ManagedInstanceTdeCertificates_Create and TdeCertificates_Create
---
 .../v2017_10_01_preview/pom.xml               |   4 +-
 .../sql/v2017_10_01_preview/Database.java     |  71 +++-
 .../v2017_10_01_preview/DatabaseStatus.java   |   6 +
 .../v2017_10_01_preview/DatabaseUpdate.java   |  59 ++-
 .../sql/v2017_10_01_preview/ElasticPool.java  |   6 +-
 .../RecoverableManagedDatabase.java           |  42 ++
 .../RecoverableManagedDatabases.java          |  40 ++
 .../implementation/DatabaseImpl.java          |  30 ++
 .../implementation/DatabaseInner.java         |  92 +++-
 ...lnerabilityAssessmentRuleBaselineImpl.java |   4 +-
 .../implementation/ElasticPoolInner.java      |  23 +-
 ...nerabilityAssessmentRuleBaselinesImpl.java |   3 +-
 .../RecoverableManagedDatabaseImpl.java       |  63 +++
 .../RecoverableManagedDatabaseInner.java      |  35 ++
 .../RecoverableManagedDatabasesImpl.java      |  65 +++
 .../RecoverableManagedDatabasesInner.java     | 401 ++++++++++++++++++
 .../SqlManagementClientImpl.java              |  14 +
 .../implementation/SqlManager.java            |  12 +
 18 files changed, 950 insertions(+), 20 deletions(-)
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
 create mode 100644 sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java

diff --git a/sql/resource-manager/v2017_10_01_preview/pom.xml b/sql/resource-manager/v2017_10_01_preview/pom.xml
index db97895f8b5c..99b5452880c0 100644
--- a/sql/resource-manager/v2017_10_01_preview/pom.xml
+++ b/sql/resource-manager/v2017_10_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
index 966ec7467b22..1032f3897e2b 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/Database.java
@@ -25,6 +25,11 @@
  * Type representing Database.
  */
 public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<SqlManager> {
+    /**
+     * @return the autoPauseDelay value.
+     */
+    Integer autoPauseDelay();
+
     /**
      * @return the catalogCollation value.
      */
@@ -120,6 +125,11 @@ public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshabl
      */
     Long maxSizeBytes();
 
+    /**
+     * @return the minCapacity value.
+     */
+    Double minCapacity();
+
     /**
      * @return the name value.
      */
@@ -236,6 +246,18 @@ interface WithLocation {
             WithCreate withLocation(String location);
         }
 
+        /**
+         * The stage of the database definition allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next definition stage
+             */
+            WithCreate withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database definition allowing to specify CatalogCollation.
          */
@@ -328,6 +350,18 @@ interface WithMaxSizeBytes {
             WithCreate withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database definition allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next definition stage
+             */
+            WithCreate withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database definition allowing to specify ReadScale.
          */
@@ -406,7 +440,14 @@ interface WithSampleName {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The name and tier of the SKU
+             * @param sku The database SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+ ```azurecli
+ az sql db list-editions -l &lt;location&gt; -o table
+ ````
+ ```powershell
+ Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
@@ -465,19 +506,31 @@ interface WithZoneRedundant {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<Database>, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
+        interface WithCreate extends Creatable<Database>, DefinitionStages.WithAutoPauseDelay, DefinitionStages.WithCatalogCollation, DefinitionStages.WithCollation, DefinitionStages.WithCreateMode, DefinitionStages.WithElasticPoolId, DefinitionStages.WithLicenseType, DefinitionStages.WithLongTermRetentionBackupResourceId, DefinitionStages.WithMaxSizeBytes, DefinitionStages.WithMinCapacity, DefinitionStages.WithReadScale, DefinitionStages.WithRecoverableDatabaseId, DefinitionStages.WithRecoveryServicesRecoveryPointId, DefinitionStages.WithRestorableDroppedDatabaseId, DefinitionStages.WithRestorePointInTime, DefinitionStages.WithSampleName, DefinitionStages.WithSku, DefinitionStages.WithSourceDatabaseDeletionDate, DefinitionStages.WithSourceDatabaseId, DefinitionStages.WithTags, DefinitionStages.WithZoneRedundant {
         }
     }
     /**
      * The template for a Database update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Database>, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
+    interface Update extends Appliable<Database>, UpdateStages.WithAutoPauseDelay, UpdateStages.WithCatalogCollation, UpdateStages.WithCollation, UpdateStages.WithCreateMode, UpdateStages.WithElasticPoolId, UpdateStages.WithLicenseType, UpdateStages.WithLongTermRetentionBackupResourceId, UpdateStages.WithMaxSizeBytes, UpdateStages.WithMinCapacity, UpdateStages.WithReadScale, UpdateStages.WithRecoverableDatabaseId, UpdateStages.WithRecoveryServicesRecoveryPointId, UpdateStages.WithRestorableDroppedDatabaseId, UpdateStages.WithRestorePointInTime, UpdateStages.WithSampleName, UpdateStages.WithSku, UpdateStages.WithSourceDatabaseDeletionDate, UpdateStages.WithSourceDatabaseId, UpdateStages.WithTags, UpdateStages.WithZoneRedundant {
     }
 
     /**
      * Grouping of Database update stages.
      */
     interface UpdateStages {
+        /**
+         * The stage of the database update allowing to specify AutoPauseDelay.
+         */
+        interface WithAutoPauseDelay {
+            /**
+             * Specifies autoPauseDelay.
+             * @param autoPauseDelay Time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled
+             * @return the next update stage
+             */
+            Update withAutoPauseDelay(Integer autoPauseDelay);
+        }
+
         /**
          * The stage of the database update allowing to specify CatalogCollation.
          */
@@ -570,6 +623,18 @@ interface WithMaxSizeBytes {
             Update withMaxSizeBytes(Long maxSizeBytes);
         }
 
+        /**
+         * The stage of the database update allowing to specify MinCapacity.
+         */
+        interface WithMinCapacity {
+            /**
+             * Specifies minCapacity.
+             * @param minCapacity Minimal capacity that database will always have allocated, if not paused
+             * @return the next update stage
+             */
+            Update withMinCapacity(Double minCapacity);
+        }
+
         /**
          * The stage of the database update allowing to specify ReadScale.
          */
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
index 9f978f320c7d..3fb2f98287b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseStatus.java
@@ -70,6 +70,12 @@ public final class DatabaseStatus extends ExpandableStringEnum<DatabaseStatus> {
     /** Static value Scaling for DatabaseStatus. */
     public static final DatabaseStatus SCALING = fromString("Scaling");
 
+    /** Static value OfflineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus OFFLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OfflineChangingDwPerformanceTiers");
+
+    /** Static value OnlineChangingDwPerformanceTiers for DatabaseStatus. */
+    public static final DatabaseStatus ONLINE_CHANGING_DW_PERFORMANCE_TIERS = fromString("OnlineChangingDwPerformanceTiers");
+
     /**
      * Creates or finds a DatabaseStatus from its string representation.
      * @param name a name to look for
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
index eafe8ef45060..ac090462a514 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/DatabaseUpdate.java
@@ -106,7 +106,8 @@ public class DatabaseUpdate {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -237,6 +238,20 @@ public class DatabaseUpdate {
     @JsonProperty(value = "properties.currentSku", access = JsonProperty.Access.WRITE_ONLY)
     private Sku currentSku;
 
+    /**
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
     /**
      * Resource tags.
      */
@@ -400,7 +415,7 @@ public DatabaseUpdate withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -689,6 +704,46 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseUpdate object itself.
+     */
+    public DatabaseUpdate withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
     /**
      * Get resource tags.
      *
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
index c7b12d377c52..fa4d492b98f7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ElasticPool.java
@@ -172,7 +172,11 @@ interface WithPerDatabaseSettings {
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku the sku parameter value
+             * @param sku The elastic pool SKU.
+ The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+ ```azurecli
+ az sql elastic-pool list-editions -l &lt;location&gt; -o table
+ ````
              * @return the next definition stage
              */
             WithCreate withSku(Sku sku);
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.java
new file mode 100644
index 000000000000..eca31ea91304
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabase.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.sql.v2017_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabaseInner;
+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.sql.v2017_10_01_preview.implementation.SqlManager;
+
+/**
+ * Type representing RecoverableManagedDatabase.
+ */
+public interface RecoverableManagedDatabase extends HasInner<RecoverableManagedDatabaseInner>, Indexable, Refreshable<RecoverableManagedDatabase>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the lastAvailableBackupDate value.
+     */
+    String lastAvailableBackupDate();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.java
new file mode 100644
index 000000000000..c73338b1d549
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/RecoverableManagedDatabases.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.sql.v2017_10_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.RecoverableManagedDatabasesInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing RecoverableManagedDatabases.
+ */
+public interface RecoverableManagedDatabases extends HasInner<RecoverableManagedDatabasesInner> {
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName);
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
index 57538e6de24c..821c2b33747f 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseImpl.java
@@ -101,6 +101,11 @@ private void resetCreateUpdateParameters() {
         this.updateParameter = new DatabaseUpdate();
     }
 
+    @Override
+    public Integer autoPauseDelay() {
+        return this.inner().autoPauseDelay();
+    }
+
     @Override
     public CatalogCollationType catalogCollation() {
         return this.inner().catalogCollation();
@@ -196,6 +201,11 @@ public Long maxSizeBytes() {
         return this.inner().maxSizeBytes();
     }
 
+    @Override
+    public Double minCapacity() {
+        return this.inner().minCapacity();
+    }
+
     @Override
     public String name() {
         return this.inner().name();
@@ -284,6 +294,16 @@ public DatabaseImpl withLocation(String location) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withAutoPauseDelay(Integer autoPauseDelay) {
+        if (isInCreateMode()) {
+            this.inner().withAutoPauseDelay(autoPauseDelay);
+        } else {
+            this.updateParameter.withAutoPauseDelay(autoPauseDelay);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withCatalogCollation(CatalogCollationType catalogCollation) {
         if (isInCreateMode()) {
@@ -354,6 +374,16 @@ public DatabaseImpl withMaxSizeBytes(Long maxSizeBytes) {
         return this;
     }
 
+    @Override
+    public DatabaseImpl withMinCapacity(Double minCapacity) {
+        if (isInCreateMode()) {
+            this.inner().withMinCapacity(minCapacity);
+        } else {
+            this.updateParameter.withMinCapacity(minCapacity);
+        }
+        return this;
+    }
+
     @Override
     public DatabaseImpl withReadScale(DatabaseReadScale readScale) {
         if (isInCreateMode()) {
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
index 9c0e11f49b7f..d9598a583582 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseInner.java
@@ -27,7 +27,20 @@
 @JsonFlatten
 public class DatabaseInner extends Resource {
     /**
-     * The name and tier of the SKU.
+     * The database SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or one of the following commands:
+     *
+     * ```azurecli
+     * az sql db list-editions -l &lt;location&gt; -o table
+     * ````
+     *
+     * ```powershell
+     * Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -125,7 +138,8 @@ public class DatabaseInner extends Resource {
      * 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline',
      * 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying',
      * 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused',
-     * 'Resuming', 'Scaling'.
+     * 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
+     * 'OnlineChangingDwPerformanceTiers'.
      */
     @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
     private DatabaseStatus status;
@@ -257,7 +271,28 @@ public class DatabaseInner extends Resource {
     private Sku currentSku;
 
     /**
-     * Get the name and tier of the SKU.
+     * Time in minutes after which database is automatically paused. A value of
+     * -1 means that automatic pause is disabled.
+     */
+    @JsonProperty(value = "properties.autoPauseDelay")
+    private Integer autoPauseDelay;
+
+    /**
+     * Minimal capacity that database will always have allocated, if not
+     * paused.
+     */
+    @JsonProperty(value = "properties.minCapacity")
+    private Double minCapacity;
+
+    /**
+     * Get the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @return the sku value
      */
@@ -266,7 +301,14 @@ public Sku sku() {
     }
 
     /**
-     * Set the name and tier of the SKU.
+     * Set the database SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or one of the following commands:
+     ```azurecli
+     az sql db list-editions -l &lt;location&gt; -o table
+     ````
+     ```powershell
+     Get-AzSqlServerServiceObjective -Location &lt;location&gt;
+     ````.
      *
      * @param sku the sku value to set
      * @return the DatabaseInner object itself.
@@ -431,7 +473,7 @@ public DatabaseInner withSourceDatabaseId(String sourceDatabaseId) {
     }
 
     /**
-     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling'.
+     * Get the status of the database. Possible values include: 'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect', 'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed', 'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing', 'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers', 'OnlineChangingDwPerformanceTiers'.
      *
      * @return the status value
      */
@@ -720,4 +762,44 @@ public Sku currentSku() {
         return this.currentSku;
     }
 
+    /**
+     * Get time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @return the autoPauseDelay value
+     */
+    public Integer autoPauseDelay() {
+        return this.autoPauseDelay;
+    }
+
+    /**
+     * Set time in minutes after which database is automatically paused. A value of -1 means that automatic pause is disabled.
+     *
+     * @param autoPauseDelay the autoPauseDelay value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withAutoPauseDelay(Integer autoPauseDelay) {
+        this.autoPauseDelay = autoPauseDelay;
+        return this;
+    }
+
+    /**
+     * Get minimal capacity that database will always have allocated, if not paused.
+     *
+     * @return the minCapacity value
+     */
+    public Double minCapacity() {
+        return this.minCapacity;
+    }
+
+    /**
+     * Set minimal capacity that database will always have allocated, if not paused.
+     *
+     * @param minCapacity the minCapacity value to set
+     * @return the DatabaseInner object itself.
+     */
+    public DatabaseInner withMinCapacity(Double minCapacity) {
+        this.minCapacity = minCapacity;
+        return this;
+    }
+
 }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
index cdae43ef347f..7c4b03e3bda7 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/DatabaseVulnerabilityAssessmentRuleBaselineImpl.java
@@ -29,7 +29,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(name, new DatabaseVulnerabilityAssessmentRuleBaselineInner());
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(name);
+        this.baselineName = name;
         //
     }
 
@@ -37,7 +37,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselineImpl extends CreatableUpdatable
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
-        this.baselineName = VulnerabilityAssessmentPolicyBaselineName.fromString(inner.name());
+        this.baselineName = inner.name();
         // set resource ancestor and positional variables
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
index e7e1135945e9..d5a449ff60bd 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ElasticPoolInner.java
@@ -23,7 +23,16 @@
 @JsonFlatten
 public class ElasticPoolInner extends Resource {
     /**
-     * The sku property.
+     * The elastic pool SKU.
+     *
+     * The list of SKUs may vary by region and support offer. To determine the
+     * SKUs (including the SKU name, tier/edition, family, and capacity) that
+     * are available to your subscription in an Azure region, use the
+     * `Capabilities_ListByLocation` REST API or the following command:
+     *
+     * ```azurecli
+     * az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     * ````.
      */
     @JsonProperty(value = "sku")
     private Sku sku;
@@ -76,7 +85,11 @@ public class ElasticPoolInner extends Resource {
     private ElasticPoolLicenseType licenseType;
 
     /**
-     * Get the sku value.
+     * Get the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @return the sku value
      */
@@ -85,7 +98,11 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the elastic pool SKU.
+     The list of SKUs may vary by region and support offer. To determine the SKUs (including the SKU name, tier/edition, family, and capacity) that are available to your subscription in an Azure region, use the `Capabilities_ListByLocation` REST API or the following command:
+     ```azurecli
+     az sql elastic-pool list-editions -l &lt;location&gt; -o table
+     ````.
      *
      * @param sku the sku value to set
      * @return the ElasticPoolInner object itself.
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
index 7b7f4ee69543..251a0a223bfc 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedDatabaseVulnerabilityAssessmentRuleBaselinesImpl.java
@@ -11,7 +11,6 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedDatabaseVulnerabilityAssessmentRuleBaselines;
-import com.microsoft.azure.management.sql.v2017_10_01_preview.VulnerabilityAssessmentPolicyBaselineName;
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.DatabaseVulnerabilityAssessmentRuleBaseline;
@@ -47,7 +46,7 @@ private Observable<DatabaseVulnerabilityAssessmentRuleBaselineInner> getDatabase
         String managedInstanceName = IdParsingUtils.getValueFromIdByName(id, "managedInstances");
         String databaseName = IdParsingUtils.getValueFromIdByName(id, "databases");
         String ruleId = IdParsingUtils.getValueFromIdByName(id, "rules");
-        VulnerabilityAssessmentPolicyBaselineName baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
+        String baselineName = VulnerabilityAssessmentPolicyBaselineName.valueOf(IdParsingUtils.getValueFromIdByName(id, "baselines"));
         ManagedDatabaseVulnerabilityAssessmentRuleBaselinesInner client = this.inner();
         return client.getAsync(resourceGroupName, managedInstanceName, databaseName, ruleId, baselineName);
     }
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.java
new file mode 100644
index 000000000000..9dbd7757bdf5
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseImpl.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.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+
+class RecoverableManagedDatabaseImpl extends IndexableRefreshableWrapperImpl<RecoverableManagedDatabase, RecoverableManagedDatabaseInner> implements RecoverableManagedDatabase {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String recoverableDatabaseName;
+
+    RecoverableManagedDatabaseImpl(RecoverableManagedDatabaseInner inner,  SqlManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        // set resource ancestor and positional variables
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.recoverableDatabaseName = IdParsingUtils.getValueFromIdByName(inner.id(), "recoverableDatabases");
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<RecoverableManagedDatabaseInner> getInnerAsync() {
+        RecoverableManagedDatabasesInner client = this.manager().inner().recoverableManagedDatabases();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.recoverableDatabaseName);
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String lastAvailableBackupDate() {
+        return this.inner().lastAvailableBackupDate();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.java
new file mode 100644
index 000000000000..08d0cf8784a1
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabaseInner.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.sql.v2017_10_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A recoverable managed database resource.
+ */
+@JsonFlatten
+public class RecoverableManagedDatabaseInner extends ProxyResource {
+    /**
+     * The last available backup date.
+     */
+    @JsonProperty(value = "properties.lastAvailableBackupDate", access = JsonProperty.Access.WRITE_ONLY)
+    private String lastAvailableBackupDate;
+
+    /**
+     * Get the last available backup date.
+     *
+     * @return the lastAvailableBackupDate value
+     */
+    public String lastAvailableBackupDate() {
+        return this.lastAvailableBackupDate;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
new file mode 100644
index 000000000000..119953c77ec6
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesImpl.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabase;
+
+class RecoverableManagedDatabasesImpl extends WrapperImpl<RecoverableManagedDatabasesInner> implements RecoverableManagedDatabases {
+    private final SqlManager manager;
+
+    RecoverableManagedDatabasesImpl(SqlManager manager) {
+        super(manager.inner().recoverableManagedDatabases());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    private RecoverableManagedDatabaseImpl wrapModel(RecoverableManagedDatabaseInner inner) {
+        return  new RecoverableManagedDatabaseImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<RecoverableManagedDatabaseInner>, Iterable<RecoverableManagedDatabaseInner>>() {
+            @Override
+            public Iterable<RecoverableManagedDatabaseInner> call(Page<RecoverableManagedDatabaseInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<RecoverableManagedDatabase> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        RecoverableManagedDatabasesInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName)
+        .map(new Func1<RecoverableManagedDatabaseInner, RecoverableManagedDatabase>() {
+            @Override
+            public RecoverableManagedDatabase call(RecoverableManagedDatabaseInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
new file mode 100644
index 000000000000..741eb5979e22
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/RecoverableManagedDatabasesInner.java
@@ -0,0 +1,401 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.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 RecoverableManagedDatabases.
+ */
+public class RecoverableManagedDatabasesInner {
+    /** The Retrofit service to perform REST calls. */
+    private RecoverableManagedDatabasesService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RecoverableManagedDatabasesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RecoverableManagedDatabasesInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(RecoverableManagedDatabasesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RecoverableManagedDatabases to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RecoverableManagedDatabasesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/recoverableDatabases/{recoverableDatabaseName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("recoverableDatabaseName") String recoverableDatabaseName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName 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.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RecoverableManagedDatabaseInner object if successful.
+     */
+    public RecoverableManagedDatabaseInner get(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName, final ServiceCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName), serviceCallback);
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<RecoverableManagedDatabaseInner> getAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, recoverableDatabaseName).map(new Func1<ServiceResponse<RecoverableManagedDatabaseInner>, RecoverableManagedDatabaseInner>() {
+            @Override
+            public RecoverableManagedDatabaseInner call(ServiceResponse<RecoverableManagedDatabaseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a recoverable managed database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param recoverableDatabaseName the String value
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RecoverableManagedDatabaseInner object
+     */
+    public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String recoverableDatabaseName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (recoverableDatabaseName == null) {
+            throw new IllegalArgumentException("Parameter recoverableDatabaseName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.get(resourceGroupName, managedInstanceName, recoverableDatabaseName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RecoverableManagedDatabaseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RecoverableManagedDatabaseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RecoverableManagedDatabaseInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RecoverableManagedDatabaseInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RecoverableManagedDatabaseInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RecoverableManagedDatabaseInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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;RecoverableManagedDatabaseInner&gt; object if successful.
+     */
+    public PagedList<RecoverableManagedDatabaseInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<RecoverableManagedDatabaseInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<RecoverableManagedDatabaseInner>(response.body()) {
+            @Override
+            public Page<RecoverableManagedDatabaseInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @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<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<RecoverableManagedDatabaseInner>> serviceFuture, final ListOperationCallback<RecoverableManagedDatabaseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<Page<RecoverableManagedDatabaseInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Page<RecoverableManagedDatabaseInner>>() {
+                @Override
+                public Page<RecoverableManagedDatabaseInner> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;RecoverableManagedDatabaseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<RecoverableManagedDatabaseInner>>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(ServiceResponse<Page<RecoverableManagedDatabaseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of recoverable managed databases.
+     *
+    ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;RecoverableManagedDatabaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> listByInstanceNextSinglePageAsync(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.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<RecoverableManagedDatabaseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<RecoverableManagedDatabaseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<RecoverableManagedDatabaseInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RecoverableManagedDatabaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RecoverableManagedDatabaseInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
index d32e61c6610d..ad2a3c376e69 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
@@ -327,6 +327,19 @@ public ManagedInstanceEncryptionProtectorsInner managedInstanceEncryptionProtect
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * The RecoverableManagedDatabasesInner object to access its operations.
+     */
+    private RecoverableManagedDatabasesInner recoverableManagedDatabases;
+
+    /**
+     * Gets the RecoverableManagedDatabasesInner object to access its operations.
+     * @return the RecoverableManagedDatabasesInner object.
+     */
+    public RecoverableManagedDatabasesInner recoverableManagedDatabases() {
+        return this.recoverableManagedDatabases;
+    }
+
     /**
      * Initializes an instance of SqlManagementClient client.
      *
@@ -377,6 +390,7 @@ protected void initialize() {
         this.managedInstanceTdeCertificates = new ManagedInstanceTdeCertificatesInner(restClient().retrofit(), this);
         this.managedInstanceKeys = new ManagedInstanceKeysInner(restClient().retrofit(), this);
         this.managedInstanceEncryptionProtectors = new ManagedInstanceEncryptionProtectorsInner(restClient().retrofit(), this);
+        this.recoverableManagedDatabases = new RecoverableManagedDatabasesInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
     }
 
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
index f76a2962112b..aeddeb2596b2 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
@@ -31,6 +31,7 @@
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceTdeCertificates;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.RecoverableManagedDatabases;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
@@ -53,6 +54,7 @@ public final class SqlManager extends ManagerCore<SqlManager, SqlManagementClien
     private ManagedInstanceTdeCertificates managedInstanceTdeCertificates;
     private ManagedInstanceKeys managedInstanceKeys;
     private ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors;
+    private RecoverableManagedDatabases recoverableManagedDatabases;
     /**
     * Get a Configurable instance that can be used to create SqlManager with optional configuration.
     *
@@ -250,6 +252,16 @@ public ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors()
         return this.managedInstanceEncryptionProtectors;
     }
 
+    /**
+     * @return Entry point to manage RecoverableManagedDatabases.
+     */
+    public RecoverableManagedDatabases recoverableManagedDatabases() {
+        if (this.recoverableManagedDatabases == null) {
+            this.recoverableManagedDatabases = new RecoverableManagedDatabasesImpl(this);
+        }
+        return this.recoverableManagedDatabases;
+    }
+
     /**
     * The implementation for Configurable interface.
     */

From ad6b442b5157d5551e3934682be2c68e10e0b31d Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2019 06:02:04 +0000
Subject: [PATCH 22/22] Generated from 39d6d1406d099e2c8734bf04ba1a00277c1d92ed
 (#199)

Adding custom words
---
 .../ManagedInstanceEncryptionProtectors.java  |  11 ++
 ...nagedInstanceEncryptionProtectorsImpl.java |   7 +
 ...agedInstanceEncryptionProtectorsInner.java | 165 ++++++++++++++++++
 3 files changed, 183 insertions(+)

diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtectors.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtectors.java
index 228e27215ed8..b40ae963ac4c 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtectors.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtectors.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.management.sql.v2017_10_01_preview;
 
+import rx.Completable;
 import rx.Observable;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.ManagedInstanceEncryptionProtectorInner;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.ManagedInstanceEncryptionProtectorsInner;
@@ -17,6 +18,16 @@
  * Type representing ManagedInstanceEncryptionProtectors.
  */
 public interface ManagedInstanceEncryptionProtectors extends HasInner<ManagedInstanceEncryptionProtectorsInner> {
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable revalidateAsync(String resourceGroupName, String managedInstanceName);
+
     /**
      * Gets a list of managed instance encryption protectors.
      *
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsImpl.java
index f5e79e61090b..68cdd241e22e 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsImpl.java
@@ -11,6 +11,7 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors;
+import rx.Completable;
 import rx.functions.Func1;
 import rx.Observable;
 import com.microsoft.azure.Page;
@@ -28,6 +29,12 @@ public SqlManager manager() {
         return this.manager;
     }
 
+    @Override
+    public Completable revalidateAsync(String resourceGroupName, String managedInstanceName) {
+        ManagedInstanceEncryptionProtectorsInner client = this.inner();
+        return client.revalidateAsync(resourceGroupName, managedInstanceName).toCompletable();
+    }
+
     @Override
     public Observable<ManagedInstanceEncryptionProtector> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
         ManagedInstanceEncryptionProtectorsInner client = this.inner();
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsInner.java
index 303c257a8ea7..6958f4560f42 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsInner.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsInner.java
@@ -27,6 +27,7 @@
 import retrofit2.http.Header;
 import retrofit2.http.Headers;
 import retrofit2.http.Path;
+import retrofit2.http.POST;
 import retrofit2.http.PUT;
 import retrofit2.http.Query;
 import retrofit2.http.Url;
@@ -60,6 +61,14 @@ public ManagedInstanceEncryptionProtectorsInner(Retrofit retrofit, SqlManagement
      * used by Retrofit to perform actually REST calls.
      */
     interface ManagedInstanceEncryptionProtectorsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors revalidate" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/encryptionProtector/{encryptionProtectorName}/revalidate")
+        Observable<Response<ResponseBody>> revalidate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("encryptionProtectorName") String encryptionProtectorName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors beginRevalidate" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/encryptionProtector/{encryptionProtectorName}/revalidate")
+        Observable<Response<ResponseBody>> beginRevalidate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("encryptionProtectorName") String encryptionProtectorName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors listByInstance" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/encryptionProtector")
         Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -82,6 +91,162 @@ interface ManagedInstanceEncryptionProtectorsService {
 
     }
 
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @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 revalidate(String resourceGroupName, String managedInstanceName) {
+        revalidateWithServiceResponseAsync(resourceGroupName, managedInstanceName).toBlocking().last().body();
+    }
+
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback 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> revalidateAsync(String resourceGroupName, String managedInstanceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(revalidateWithServiceResponseAsync(resourceGroupName, managedInstanceName), serviceCallback);
+    }
+
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> revalidateAsync(String resourceGroupName, String managedInstanceName) {
+        return revalidateWithServiceResponseAsync(resourceGroupName, managedInstanceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> revalidateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String encryptionProtectorName = "current";
+        Observable<Response<ResponseBody>> observable = service.revalidate(resourceGroupName, managedInstanceName, encryptionProtectorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @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 beginRevalidate(String resourceGroupName, String managedInstanceName) {
+        beginRevalidateWithServiceResponseAsync(resourceGroupName, managedInstanceName).toBlocking().single().body();
+    }
+
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param serviceCallback 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> beginRevalidateAsync(String resourceGroupName, String managedInstanceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginRevalidateWithServiceResponseAsync(resourceGroupName, managedInstanceName), serviceCallback);
+    }
+
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginRevalidateAsync(String resourceGroupName, String managedInstanceName) {
+        return beginRevalidateWithServiceResponseAsync(resourceGroupName, managedInstanceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Revalidates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginRevalidateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String encryptionProtectorName = "current";
+        return service.beginRevalidate(resourceGroupName, managedInstanceName, encryptionProtectorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginRevalidateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginRevalidateDelegate(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 a list of managed instance encryption protectors.
      *