diff --git a/azure-mgmt-compute/HISTORY.rst b/azure-mgmt-compute/HISTORY.rst
index fc0f182a6ecb..bf3e7dc675c5 100644
--- a/azure-mgmt-compute/HISTORY.rst
+++ b/azure-mgmt-compute/HISTORY.rst
@@ -3,6 +3,25 @@
 Release History
 ===============
 
+4.1.0 (2018-09-12)
+++++++++++++++++++
+
+2018-06-01 for 'disks' and 'snapshots' (new default)
+
+**Features**
+
+- Model DiskUpdate has a new parameter disk_iops_read_write
+- Model DiskUpdate has a new parameter disk_mbps_read_write
+- Model VirtualMachineUpdate has a new parameter additional_capabilities (ultraSSDEnabled attribute)
+- Model VirtualMachineScaleSetVM has a new parameter additional_capabilities (ultraSSDEnabled attribute)
+- Model VirtualMachineScaleSetPublicIPAddressConfiguration has a new parameter public_ip_prefix
+- Model Disk has a new parameter disk_iops_read_write
+- Model Disk has a new parameter disk_mbps_read_write
+- Model VirtualMachineScaleSetVMProfile has a new parameter additional_capabilities (ultraSSDEnabled attribute)
+- Model VirtualMachine has a new parameter additional_capabilities (ultraSSDEnabled attribute)
+- Added operation VirtualMachineScaleSetRollingUpgradesOperations.start_extension_upgrade
+- New enum value UltraSSD_LRS for StorageAccountTypes
+
 4.0.1 (2018-07-23)
 ++++++++++++++++++
 
diff --git a/azure-mgmt-compute/README.rst b/azure-mgmt-compute/README.rst
index cc57dfa74240..9657f86d6862 100644
--- a/azure-mgmt-compute/README.rst
+++ b/azure-mgmt-compute/README.rst
@@ -6,7 +6,7 @@ This is the Microsoft Azure Compute Management Client Library.
 Azure Resource Manager (ARM) is the next generation of management APIs that
 replace the old Azure Service Management (ASM).
 
-This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
+This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 For the older Azure Service Management (ASM) libraries, see
 `azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
index 76776466d5d0..66da49f5387c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -84,9 +84,7 @@ class ComputeManagementClient(MultiApiClientMixin, SDKClient):
     _PROFILE_TAG = "azure.mgmt.compute.ComputeManagementClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
-            'disks': '2018-04-01',
             'resource_skus': '2017-09-01',
-            'snapshots': '2018-04-01',
             None: DEFAULT_API_VERSION
         }},
         _PROFILE_TAG + " latest"
@@ -145,7 +143,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
             from .v2018_06_01 import models
             return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
-    
+
     @property
     def availability_sets(self):
         """Instance depends on the API version:
@@ -184,6 +182,7 @@ def disks(self):
            * 2016-04-30-preview: :class:`DisksOperations<azure.mgmt.compute.v2016_04_30_preview.operations.DisksOperations>`
            * 2017-03-30: :class:`DisksOperations<azure.mgmt.compute.v2017_03_30.operations.DisksOperations>`
            * 2018-04-01: :class:`DisksOperations<azure.mgmt.compute.v2018_04_01.operations.DisksOperations>`
+           * 2018-06-01: :class:`DisksOperations<azure.mgmt.compute.v2018_06_01.operations.DisksOperations>`
         """
         api_version = self._get_api_version('disks')
         if api_version == '2016-04-30-preview':
@@ -192,6 +191,8 @@ def disks(self):
             from .v2017_03_30.operations import DisksOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import DisksOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import DisksOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -321,6 +322,7 @@ def snapshots(self):
            * 2016-04-30-preview: :class:`SnapshotsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.SnapshotsOperations>`
            * 2017-03-30: :class:`SnapshotsOperations<azure.mgmt.compute.v2017_03_30.operations.SnapshotsOperations>`
            * 2018-04-01: :class:`SnapshotsOperations<azure.mgmt.compute.v2018_04_01.operations.SnapshotsOperations>`
+           * 2018-06-01: :class:`SnapshotsOperations<azure.mgmt.compute.v2018_06_01.operations.SnapshotsOperations>`
         """
         api_version = self._get_api_version('snapshots')
         if api_version == '2016-04-30-preview':
@@ -329,6 +331,8 @@ def snapshots(self):
             from .v2017_03_30.operations import SnapshotsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import SnapshotsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import SnapshotsOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
diff --git a/azure-mgmt-compute/azure/mgmt/compute/models.py b/azure-mgmt-compute/azure/mgmt/compute/models.py
index eb8b45d7db77..56727de1c11a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/models.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/models.py
@@ -7,7 +7,6 @@
 import warnings
 
 from .v2017_09_01.models import *
-from .v2018_04_01.models import *
 from .v2018_06_01.models import * # Note that this line is overriding some models of 2018-04-01. See link below for details.
 
 warnings.warn("Import models from this file is deprecated. See https://aka.ms/pysdkmodels",
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk.py
index d21d64c3c2ea..83f4e11cb9cd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk.py
@@ -46,7 +46,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2015_06_15.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk_py3.py
index c273f2037df3..d3b72348ed17 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/data_disk_py3.py
@@ -46,7 +46,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2015_06_15.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk.py
index 79b03a5188a7..68c332c68631 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk.py
@@ -55,7 +55,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2015_06_15.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk_py3.py
index 2b5a1686e286..91f30add6e2f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/os_disk_py3.py
@@ -55,7 +55,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2015_06_15.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk.py
index b7faf4202ea7..43bafc130205 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk.py
@@ -46,7 +46,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk_py3.py
index 71fe40ece87d..4c613b75231b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/data_disk_py3.py
@@ -46,7 +46,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk.py
index 459ddcd37863..9c5e9be8a82e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk.py
@@ -55,7 +55,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk_py3.py
index fb52bdcd3e5b..2722bbce24aa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/os_disk_py3.py
@@ -55,7 +55,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk.py
index 1db128727007..c866dba239b3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk.py
@@ -48,7 +48,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_04_30_preview.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk_py3.py
index adcc250ba2e2..697cc8449812 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/data_disk_py3.py
@@ -48,7 +48,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_04_30_preview.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk.py
index cd7d915b62f1..8cfa5ba076a5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk.py
@@ -57,7 +57,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_04_30_preview.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk_py3.py
index e8101921250d..bb5b151ec7aa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/os_disk_py3.py
@@ -57,7 +57,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_04_30_preview.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk.py
index 52812568311f..61138bcb9e6f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk.py
@@ -34,7 +34,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_04_30_preview.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk_py3.py
index d591a546afa4..ff9363b506ac 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_data_disk_py3.py
@@ -34,7 +34,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2016_04_30_preview.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk.py
index 5a0bf58d6c10..32a36df43517 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk.py
@@ -46,7 +46,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk_py3.py
index ce4a52a28af6..64f014af5da9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/data_disk_py3.py
@@ -46,7 +46,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk.py
index b30836ab57c7..fd18571e4bb8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk.py
@@ -55,7 +55,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk_py3.py
index 49610fe43158..d86663c087e1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/os_disk_py3.py
@@ -55,7 +55,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk.py
index 43b4d78fe75d..421a5027f612 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk.py
@@ -33,7 +33,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk_py3.py
index 8fca185a969f..29d44187ea43 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_data_disk_py3.py
@@ -33,7 +33,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_03_30.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py
index ace2f7aed980..a3e0cce25339 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py
@@ -63,8 +63,6 @@
     from .virtual_machine_identity_py3 import VirtualMachineIdentity
     from .maintenance_redeploy_status_py3 import MaintenanceRedeployStatus
     from .virtual_machine_instance_view_py3 import VirtualMachineInstanceView
-    from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
-    from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
     from .virtual_machine_py3 import VirtualMachine
     from .virtual_machine_update_py3 import VirtualMachineUpdate
     from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
@@ -117,6 +115,8 @@
     from .rolling_upgrade_progress_info_py3 import RollingUpgradeProgressInfo
     from .upgrade_operation_historical_status_info_properties_py3 import UpgradeOperationHistoricalStatusInfoProperties
     from .upgrade_operation_historical_status_info_py3 import UpgradeOperationHistoricalStatusInfo
+    from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
     from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
     from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
@@ -191,8 +191,6 @@
     from .virtual_machine_identity import VirtualMachineIdentity
     from .maintenance_redeploy_status import MaintenanceRedeployStatus
     from .virtual_machine_instance_view import VirtualMachineInstanceView
-    from .virtual_machine_health_status import VirtualMachineHealthStatus
-    from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
     from .virtual_machine import VirtualMachine
     from .virtual_machine_update import VirtualMachineUpdate
     from .auto_os_upgrade_policy import AutoOSUpgradePolicy
@@ -245,6 +243,8 @@
     from .rolling_upgrade_progress_info import RollingUpgradeProgressInfo
     from .upgrade_operation_historical_status_info_properties import UpgradeOperationHistoricalStatusInfoProperties
     from .upgrade_operation_historical_status_info import UpgradeOperationHistoricalStatusInfo
+    from .virtual_machine_health_status import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
     from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
     from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
@@ -358,8 +358,6 @@
     'VirtualMachineIdentity',
     'MaintenanceRedeployStatus',
     'VirtualMachineInstanceView',
-    'VirtualMachineHealthStatus',
-    'VirtualMachineScaleSetVMInstanceView',
     'VirtualMachine',
     'VirtualMachineUpdate',
     'AutoOSUpgradePolicy',
@@ -412,6 +410,8 @@
     'RollingUpgradeProgressInfo',
     'UpgradeOperationHistoricalStatusInfoProperties',
     'UpgradeOperationHistoricalStatusInfo',
+    'VirtualMachineHealthStatus',
+    'VirtualMachineScaleSetVMInstanceView',
     'VirtualMachineScaleSetVM',
     'RollingUpgradeRunningStatus',
     'RollingUpgradeStatusInfo',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk.py
index 41e260cdca7e..9aa528dc1ffc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk.py
@@ -49,7 +49,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk_py3.py
index b638a05f74a0..5fa6a4c447b7 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk_py3.py
@@ -49,7 +49,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk.py
index a81c8e1fec5e..1ea552d93227 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk.py
@@ -58,7 +58,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk_py3.py
index edfcc1b27230..86fdc0a012b5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/os_disk_py3.py
@@ -58,7 +58,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine.py
index 8f9d1a3bb872..5810c1a09641 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine.py
@@ -74,7 +74,7 @@ class VirtualMachine(Resource):
     :vartype provisioning_state: str
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
     :param license_type: Specifies that the image or disk that is being used
      was licensed on-premises. This element is only used for images that
      contain the Windows Server operating system. <br><br> Possible values are:
@@ -124,7 +124,7 @@ class VirtualMachine(Resource):
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
         'license_type': {'key': 'properties.licenseType', 'type': 'str'},
         'vm_id': {'key': 'properties.vmId', 'type': 'str'},
         'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_py3.py
index c3f1a274e98e..53a7270afebc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_py3.py
@@ -74,7 +74,7 @@ class VirtualMachine(Resource):
     :vartype provisioning_state: str
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
     :param license_type: Specifies that the image or disk that is being used
      was licensed on-premises. This element is only used for images that
      contain the Windows Server operating system. <br><br> Possible values are:
@@ -124,7 +124,7 @@ class VirtualMachine(Resource):
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
         'license_type': {'key': 'properties.licenseType', 'type': 'str'},
         'vm_id': {'key': 'properties.vmId', 'type': 'str'},
         'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk.py
index fc62cb57fc02..ac080fa560d2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk.py
@@ -36,7 +36,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk_py3.py
index 51ebc8cdd38a..b8f748d8b3f0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_data_disk_py3.py
@@ -36,7 +36,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm.py
index 0bde411429e5..323df5aaceaf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm.py
@@ -41,7 +41,7 @@ class VirtualMachineScaleSetVM(Resource):
     :vartype vm_id: str
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -123,7 +123,7 @@ class VirtualMachineScaleSetVM(Resource):
         'sku': {'key': 'sku', 'type': 'Sku'},
         'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
         'vm_id': {'key': 'properties.vmId', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm_py3.py
index 24d0acda8dcb..1d0b7ce4dca1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm_py3.py
@@ -41,7 +41,7 @@ class VirtualMachineScaleSetVM(Resource):
     :vartype vm_id: str
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -123,7 +123,7 @@ class VirtualMachineScaleSetVM(Resource):
         'sku': {'key': 'sku', 'type': 'Sku'},
         'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
         'vm_id': {'key': 'properties.vmId', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update.py
index 1d3cfde50468..710df35dad13 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update.py
@@ -64,7 +64,7 @@ class VirtualMachineUpdate(UpdateResource):
     :vartype provisioning_state: str
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
     :param license_type: Specifies that the image or disk that is being used
      was licensed on-premises. This element is only used for images that
      contain the Windows Server operating system. <br><br> Possible values are:
@@ -102,7 +102,7 @@ class VirtualMachineUpdate(UpdateResource):
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
         'license_type': {'key': 'properties.licenseType', 'type': 'str'},
         'vm_id': {'key': 'properties.vmId', 'type': 'str'},
         'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update_py3.py
index d90f69d892df..33abe81fdb0b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update_py3.py
@@ -64,7 +64,7 @@ class VirtualMachineUpdate(UpdateResource):
     :vartype provisioning_state: str
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
     :param license_type: Specifies that the image or disk that is being used
      was licensed on-premises. This element is only used for images that
      contain the Windows Server operating system. <br><br> Possible values are:
@@ -102,7 +102,7 @@ class VirtualMachineUpdate(UpdateResource):
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
         'license_type': {'key': 'properties.licenseType', 'type': 'str'},
         'vm_id': {'key': 'properties.vmId', 'type': 'str'},
         'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri.py
index 9ee6b01de1e1..fec7ad1244ab 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri.py
@@ -27,7 +27,7 @@ class AccessUri(Model):
     }
 
     _attribute_map = {
-        'access_sas': {'key': 'properties.output.accessSAS', 'type': 'str'},
+        'access_sas': {'key': 'accessSAS', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri_py3.py
index bb9e56aa4221..c13208a20d8d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri_py3.py
@@ -27,7 +27,7 @@ class AccessUri(Model):
     }
 
     _attribute_map = {
-        'access_sas': {'key': 'properties.output.accessSAS', 'type': 'str'},
+        'access_sas': {'key': 'accessSAS', 'type': 'str'},
     }
 
     def __init__(self, **kwargs) -> None:
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
index b72af03bf155..830e382d6e10 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
@@ -49,7 +49,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
index 9a75b455ed11..304ad2575077 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
@@ -49,7 +49,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
index e82f77c2447c..e1c2cab2b103 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
@@ -58,7 +58,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
index e45324c5df9c..c7376df8249b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
@@ -58,7 +58,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py
index 4d182b701b72..b46dc8415314 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py
@@ -31,6 +31,8 @@
 from .operations.galleries_operations import GalleriesOperations
 from .operations.gallery_images_operations import GalleryImagesOperations
 from .operations.gallery_image_versions_operations import GalleryImageVersionsOperations
+from .operations.disks_operations import DisksOperations
+from .operations.snapshots_operations import SnapshotsOperations
 from . import models
 
 
@@ -110,6 +112,10 @@ class ComputeManagementClient(SDKClient):
     :vartype gallery_images: azure.mgmt.compute.v2018_06_01.operations.GalleryImagesOperations
     :ivar gallery_image_versions: GalleryImageVersions operations
     :vartype gallery_image_versions: azure.mgmt.compute.v2018_06_01.operations.GalleryImageVersionsOperations
+    :ivar disks: Disks operations
+    :vartype disks: azure.mgmt.compute.v2018_06_01.operations.DisksOperations
+    :ivar snapshots: Snapshots operations
+    :vartype snapshots: azure.mgmt.compute.v2018_06_01.operations.SnapshotsOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -168,3 +174,7 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.gallery_image_versions = GalleryImageVersionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.disks = DisksOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.snapshots = SnapshotsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py
index 71cbc14a54ae..42b0ba599d73 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py
@@ -42,6 +42,7 @@
     from .os_disk_py3 import OSDisk
     from .data_disk_py3 import DataDisk
     from .storage_profile_py3 import StorageProfile
+    from .additional_capabilities_py3 import AdditionalCapabilities
     from .additional_unattend_content_py3 import AdditionalUnattendContent
     from .win_rm_listener_py3 import WinRMListener
     from .win_rm_configuration_py3 import WinRMConfiguration
@@ -153,10 +154,25 @@
     from .regional_replication_status_py3 import RegionalReplicationStatus
     from .replication_status_py3 import ReplicationStatus
     from .gallery_image_version_py3 import GalleryImageVersion
+    from .target_region_py3 import TargetRegion
     from .managed_artifact_py3 import ManagedArtifact
     from .gallery_artifact_source_py3 import GalleryArtifactSource
     from .gallery_artifact_publishing_profile_base_py3 import GalleryArtifactPublishingProfileBase
     from .gallery_disk_image_py3 import GalleryDiskImage
+    from .disk_sku_py3 import DiskSku
+    from .image_disk_reference_py3 import ImageDiskReference
+    from .creation_data_py3 import CreationData
+    from .source_vault_py3 import SourceVault
+    from .key_vault_and_secret_reference_py3 import KeyVaultAndSecretReference
+    from .key_vault_and_key_reference_py3 import KeyVaultAndKeyReference
+    from .encryption_settings_py3 import EncryptionSettings
+    from .disk_py3 import Disk
+    from .disk_update_py3 import DiskUpdate
+    from .snapshot_sku_py3 import SnapshotSku
+    from .grant_access_data_py3 import GrantAccessData
+    from .access_uri_py3 import AccessUri
+    from .snapshot_py3 import Snapshot
+    from .snapshot_update_py3 import SnapshotUpdate
 except (SyntaxError, ImportError):
     from .compute_operation_value import ComputeOperationValue
     from .instance_view_status import InstanceViewStatus
@@ -190,6 +206,7 @@
     from .os_disk import OSDisk
     from .data_disk import DataDisk
     from .storage_profile import StorageProfile
+    from .additional_capabilities import AdditionalCapabilities
     from .additional_unattend_content import AdditionalUnattendContent
     from .win_rm_listener import WinRMListener
     from .win_rm_configuration import WinRMConfiguration
@@ -301,10 +318,25 @@
     from .regional_replication_status import RegionalReplicationStatus
     from .replication_status import ReplicationStatus
     from .gallery_image_version import GalleryImageVersion
+    from .target_region import TargetRegion
     from .managed_artifact import ManagedArtifact
     from .gallery_artifact_source import GalleryArtifactSource
     from .gallery_artifact_publishing_profile_base import GalleryArtifactPublishingProfileBase
     from .gallery_disk_image import GalleryDiskImage
+    from .disk_sku import DiskSku
+    from .image_disk_reference import ImageDiskReference
+    from .creation_data import CreationData
+    from .source_vault import SourceVault
+    from .key_vault_and_secret_reference import KeyVaultAndSecretReference
+    from .key_vault_and_key_reference import KeyVaultAndKeyReference
+    from .encryption_settings import EncryptionSettings
+    from .disk import Disk
+    from .disk_update import DiskUpdate
+    from .snapshot_sku import SnapshotSku
+    from .grant_access_data import GrantAccessData
+    from .access_uri import AccessUri
+    from .snapshot import Snapshot
+    from .snapshot_update import SnapshotUpdate
 from .compute_operation_value_paged import ComputeOperationValuePaged
 from .availability_set_paged import AvailabilitySetPaged
 from .virtual_machine_size_paged import VirtualMachineSizePaged
@@ -320,6 +352,8 @@
 from .gallery_paged import GalleryPaged
 from .gallery_image_paged import GalleryImagePaged
 from .gallery_image_version_paged import GalleryImageVersionPaged
+from .disk_paged import DiskPaged
+from .snapshot_paged import SnapshotPaged
 from .compute_management_client_enums import (
     StatusLevelTypes,
     OperatingSystemTypes,
@@ -344,10 +378,13 @@
     RollingUpgradeStatusCode,
     RollingUpgradeActionType,
     IntervalInMins,
-    ScaleTier,
     AggregatedReplicationState,
     ReplicationState,
     HostCaching,
+    DiskStorageAccountTypes,
+    DiskCreateOption,
+    SnapshotStorageAccountTypes,
+    AccessLevel,
     InstanceViewTypes,
     ReplicationStatusTypes,
 )
@@ -385,6 +422,7 @@
     'OSDisk',
     'DataDisk',
     'StorageProfile',
+    'AdditionalCapabilities',
     'AdditionalUnattendContent',
     'WinRMListener',
     'WinRMConfiguration',
@@ -496,10 +534,25 @@
     'RegionalReplicationStatus',
     'ReplicationStatus',
     'GalleryImageVersion',
+    'TargetRegion',
     'ManagedArtifact',
     'GalleryArtifactSource',
     'GalleryArtifactPublishingProfileBase',
     'GalleryDiskImage',
+    'DiskSku',
+    'ImageDiskReference',
+    'CreationData',
+    'SourceVault',
+    'KeyVaultAndSecretReference',
+    'KeyVaultAndKeyReference',
+    'EncryptionSettings',
+    'Disk',
+    'DiskUpdate',
+    'SnapshotSku',
+    'GrantAccessData',
+    'AccessUri',
+    'Snapshot',
+    'SnapshotUpdate',
     'ComputeOperationValuePaged',
     'AvailabilitySetPaged',
     'VirtualMachineSizePaged',
@@ -515,6 +568,8 @@
     'GalleryPaged',
     'GalleryImagePaged',
     'GalleryImageVersionPaged',
+    'DiskPaged',
+    'SnapshotPaged',
     'StatusLevelTypes',
     'OperatingSystemTypes',
     'VirtualMachineSizeTypes',
@@ -538,10 +593,13 @@
     'RollingUpgradeStatusCode',
     'RollingUpgradeActionType',
     'IntervalInMins',
-    'ScaleTier',
     'AggregatedReplicationState',
     'ReplicationState',
     'HostCaching',
+    'DiskStorageAccountTypes',
+    'DiskCreateOption',
+    'SnapshotStorageAccountTypes',
+    'AccessLevel',
     'InstanceViewTypes',
     'ReplicationStatusTypes',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/access_uri.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/access_uri.py
new file mode 100644
index 000000000000..fec7ad1244ab
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/access_uri.py
@@ -0,0 +1,35 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AccessUri(Model):
+    """A disk access SAS uri.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar access_sas: A SAS uri for accessing a disk.
+    :vartype access_sas: str
+    """
+
+    _validation = {
+        'access_sas': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'access_sas': {'key': 'accessSAS', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AccessUri, self).__init__(**kwargs)
+        self.access_sas = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/access_uri_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/access_uri_py3.py
new file mode 100644
index 000000000000..c13208a20d8d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/access_uri_py3.py
@@ -0,0 +1,35 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AccessUri(Model):
+    """A disk access SAS uri.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar access_sas: A SAS uri for accessing a disk.
+    :vartype access_sas: str
+    """
+
+    _validation = {
+        'access_sas': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'access_sas': {'key': 'accessSAS', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(AccessUri, self).__init__(**kwargs)
+        self.access_sas = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_capabilities.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_capabilities.py
new file mode 100644
index 000000000000..8b572a90c593
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_capabilities.py
@@ -0,0 +1,33 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AdditionalCapabilities(Model):
+    """Enables or disables a capability on the virtual machine or virtual machine
+    scale set.
+
+    :param ultra_ssd_enabled: Enables or disables a capability to have 1 or
+     more managed data disks with UltraSSD_LRS storage account on the VM or
+     VMSS. Managed disks with storage account type UltraSSD_LRS can be added to
+     a virtual machine or virtual machine scale set only if this property is
+     enabled.
+    :type ultra_ssd_enabled: bool
+    """
+
+    _attribute_map = {
+        'ultra_ssd_enabled': {'key': 'ultraSSDEnabled', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AdditionalCapabilities, self).__init__(**kwargs)
+        self.ultra_ssd_enabled = kwargs.get('ultra_ssd_enabled', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_capabilities_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_capabilities_py3.py
new file mode 100644
index 000000000000..746fccf9c049
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_capabilities_py3.py
@@ -0,0 +1,33 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AdditionalCapabilities(Model):
+    """Enables or disables a capability on the virtual machine or virtual machine
+    scale set.
+
+    :param ultra_ssd_enabled: Enables or disables a capability to have 1 or
+     more managed data disks with UltraSSD_LRS storage account on the VM or
+     VMSS. Managed disks with storage account type UltraSSD_LRS can be added to
+     a virtual machine or virtual machine scale set only if this property is
+     enabled.
+    :type ultra_ssd_enabled: bool
+    """
+
+    _attribute_map = {
+        'ultra_ssd_enabled': {'key': 'ultraSSDEnabled', 'type': 'bool'},
+    }
+
+    def __init__(self, *, ultra_ssd_enabled: bool=None, **kwargs) -> None:
+        super(AdditionalCapabilities, self).__init__(**kwargs)
+        self.ultra_ssd_enabled = ultra_ssd_enabled
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_management_client_enums.py
index 7992a6cd0806..994228e929a1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_management_client_enums.py
@@ -214,6 +214,7 @@ class StorageAccountTypes(str, Enum):
     standard_lrs = "Standard_LRS"
     premium_lrs = "Premium_LRS"
     standard_ssd_lrs = "StandardSSD_LRS"
+    ultra_ssd_lrs = "UltraSSD_LRS"
 
 
 class PassNames(str, Enum):
@@ -328,12 +329,6 @@ class IntervalInMins(str, Enum):
     sixty_mins = "SixtyMins"
 
 
-class ScaleTier(str, Enum):
-
-    s30 = "S30"
-    s100 = "S100"
-
-
 class AggregatedReplicationState(str, Enum):
 
     unknown = "Unknown"
@@ -357,6 +352,37 @@ class HostCaching(str, Enum):
     read_write = "ReadWrite"
 
 
+class DiskStorageAccountTypes(str, Enum):
+
+    standard_lrs = "Standard_LRS"
+    premium_lrs = "Premium_LRS"
+    standard_ssd_lrs = "StandardSSD_LRS"
+    ultra_ssd_lrs = "UltraSSD_LRS"
+
+
+class DiskCreateOption(str, Enum):
+
+    empty = "Empty"
+    attach = "Attach"
+    from_image = "FromImage"
+    import_enum = "Import"
+    copy = "Copy"
+    restore = "Restore"
+
+
+class SnapshotStorageAccountTypes(str, Enum):
+
+    standard_lrs = "Standard_LRS"
+    premium_lrs = "Premium_LRS"
+    standard_zrs = "Standard_ZRS"
+
+
+class AccessLevel(str, Enum):
+
+    none = "None"
+    read = "Read"
+
+
 class InstanceViewTypes(str, Enum):
 
     instance_view = "instanceView"
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/creation_data.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/creation_data.py
new file mode 100644
index 000000000000..788d10ece334
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/creation_data.py
@@ -0,0 +1,58 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class CreationData(Model):
+    """Data used when creating a disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param create_option: Required. This enumerates the possible sources of a
+     disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage',
+     'Import', 'Copy', 'Restore'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOption
+    :param storage_account_id: If createOption is Import, the Azure Resource
+     Manager identifier of the storage account containing the blob to import as
+     a disk. Required only if the blob is in a different subscription
+    :type storage_account_id: str
+    :param image_reference: Disk source information.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageDiskReference
+    :param source_uri: If createOption is Import, this is the URI of a blob to
+     be imported into a managed disk.
+    :type source_uri: str
+    :param source_resource_id: If createOption is Copy, this is the ARM id of
+     the source snapshot or disk.
+    :type source_resource_id: str
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        'storage_account_id': {'key': 'storageAccountId', 'type': 'str'},
+        'image_reference': {'key': 'imageReference', 'type': 'ImageDiskReference'},
+        'source_uri': {'key': 'sourceUri', 'type': 'str'},
+        'source_resource_id': {'key': 'sourceResourceId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(CreationData, self).__init__(**kwargs)
+        self.create_option = kwargs.get('create_option', None)
+        self.storage_account_id = kwargs.get('storage_account_id', None)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.source_uri = kwargs.get('source_uri', None)
+        self.source_resource_id = kwargs.get('source_resource_id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/creation_data_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/creation_data_py3.py
new file mode 100644
index 000000000000..834999d555af
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/creation_data_py3.py
@@ -0,0 +1,58 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class CreationData(Model):
+    """Data used when creating a disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param create_option: Required. This enumerates the possible sources of a
+     disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage',
+     'Import', 'Copy', 'Restore'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOption
+    :param storage_account_id: If createOption is Import, the Azure Resource
+     Manager identifier of the storage account containing the blob to import as
+     a disk. Required only if the blob is in a different subscription
+    :type storage_account_id: str
+    :param image_reference: Disk source information.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageDiskReference
+    :param source_uri: If createOption is Import, this is the URI of a blob to
+     be imported into a managed disk.
+    :type source_uri: str
+    :param source_resource_id: If createOption is Copy, this is the ARM id of
+     the source snapshot or disk.
+    :type source_resource_id: str
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        'storage_account_id': {'key': 'storageAccountId', 'type': 'str'},
+        'image_reference': {'key': 'imageReference', 'type': 'ImageDiskReference'},
+        'source_uri': {'key': 'sourceUri', 'type': 'str'},
+        'source_resource_id': {'key': 'sourceResourceId', 'type': 'str'},
+    }
+
+    def __init__(self, *, create_option, storage_account_id: str=None, image_reference=None, source_uri: str=None, source_resource_id: str=None, **kwargs) -> None:
+        super(CreationData, self).__init__(**kwargs)
+        self.create_option = create_option
+        self.storage_account_id = storage_account_id
+        self.image_reference = image_reference
+        self.source_uri = source_uri
+        self.source_resource_id = source_resource_id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk.py
index 13e4cbe4499e..82ac3b499fa2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk.py
@@ -49,7 +49,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_py3.py
index 84ca02e05d3d..5a12f5f91bea 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_py3.py
@@ -49,7 +49,7 @@ class DataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk.py
new file mode 100644
index 000000000000..90f5bc9d0b3d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk.py
@@ -0,0 +1,112 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .resource import Resource
+
+
+class Disk(Resource):
+    """Disk resource.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :param location: Required. Resource location
+    :type location: str
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :ivar managed_by: A relative URI containing the ID of the VM that has the
+     disk attached.
+    :vartype managed_by: str
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.DiskSku
+    :param zones: The Logical zone list for Disk.
+    :type zones: list[str]
+    :ivar time_created: The time when the disk was created.
+    :vartype time_created: datetime
+    :param os_type: The Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param creation_data: Required. Disk source information. CreationData
+     information cannot be changed after the disk has been created.
+    :type creation_data: ~azure.mgmt.compute.v2018_06_01.models.CreationData
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :ivar provisioning_state: The disk provisioning state.
+    :vartype provisioning_state: str
+    :param disk_iops_read_write: The number of IOPS allowed for this disk;
+     only settable for UltraSSD disks. One operation can transfer between 4k
+     and 256k bytes.
+    :type disk_iops_read_write: long
+    :param disk_mbps_read_write: The bandwidth allowed for this disk; only
+     settable for UltraSSD disks. MBps means millions of bytes per second - MB
+     here uses the ISO notation, of powers of 10.
+    :type disk_mbps_read_write: int
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'managed_by': {'readonly': True},
+        'time_created': {'readonly': True},
+        'creation_data': {'required': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'managed_by': {'key': 'managedBy', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+        'time_created': {'key': 'properties.timeCreated', 'type': 'iso-8601'},
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'creation_data': {'key': 'properties.creationData', 'type': 'CreationData'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'disk_iops_read_write': {'key': 'properties.diskIOPSReadWrite', 'type': 'long'},
+        'disk_mbps_read_write': {'key': 'properties.diskMBpsReadWrite', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Disk, self).__init__(**kwargs)
+        self.managed_by = None
+        self.sku = kwargs.get('sku', None)
+        self.zones = kwargs.get('zones', None)
+        self.time_created = None
+        self.os_type = kwargs.get('os_type', None)
+        self.creation_data = kwargs.get('creation_data', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.provisioning_state = None
+        self.disk_iops_read_write = kwargs.get('disk_iops_read_write', None)
+        self.disk_mbps_read_write = kwargs.get('disk_mbps_read_write', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_paged.py
new file mode 100644
index 000000000000..d51f242cd3bf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_paged.py
@@ -0,0 +1,27 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.paging import Paged
+
+
+class DiskPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Disk <azure.mgmt.compute.v2018_06_01.models.Disk>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Disk]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(DiskPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_py3.py
new file mode 100644
index 000000000000..1c4d9ac33fd9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_py3.py
@@ -0,0 +1,112 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .resource_py3 import Resource
+
+
+class Disk(Resource):
+    """Disk resource.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :param location: Required. Resource location
+    :type location: str
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :ivar managed_by: A relative URI containing the ID of the VM that has the
+     disk attached.
+    :vartype managed_by: str
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.DiskSku
+    :param zones: The Logical zone list for Disk.
+    :type zones: list[str]
+    :ivar time_created: The time when the disk was created.
+    :vartype time_created: datetime
+    :param os_type: The Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param creation_data: Required. Disk source information. CreationData
+     information cannot be changed after the disk has been created.
+    :type creation_data: ~azure.mgmt.compute.v2018_06_01.models.CreationData
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :ivar provisioning_state: The disk provisioning state.
+    :vartype provisioning_state: str
+    :param disk_iops_read_write: The number of IOPS allowed for this disk;
+     only settable for UltraSSD disks. One operation can transfer between 4k
+     and 256k bytes.
+    :type disk_iops_read_write: long
+    :param disk_mbps_read_write: The bandwidth allowed for this disk; only
+     settable for UltraSSD disks. MBps means millions of bytes per second - MB
+     here uses the ISO notation, of powers of 10.
+    :type disk_mbps_read_write: int
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'managed_by': {'readonly': True},
+        'time_created': {'readonly': True},
+        'creation_data': {'required': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'managed_by': {'key': 'managedBy', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+        'time_created': {'key': 'properties.timeCreated', 'type': 'iso-8601'},
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'creation_data': {'key': 'properties.creationData', 'type': 'CreationData'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'disk_iops_read_write': {'key': 'properties.diskIOPSReadWrite', 'type': 'long'},
+        'disk_mbps_read_write': {'key': 'properties.diskMBpsReadWrite', 'type': 'int'},
+    }
+
+    def __init__(self, *, location: str, creation_data, tags=None, sku=None, zones=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, disk_iops_read_write: int=None, disk_mbps_read_write: int=None, **kwargs) -> None:
+        super(Disk, self).__init__(location=location, tags=tags, **kwargs)
+        self.managed_by = None
+        self.sku = sku
+        self.zones = zones
+        self.time_created = None
+        self.os_type = os_type
+        self.creation_data = creation_data
+        self.disk_size_gb = disk_size_gb
+        self.encryption_settings = encryption_settings
+        self.provisioning_state = None
+        self.disk_iops_read_write = disk_iops_read_write
+        self.disk_mbps_read_write = disk_mbps_read_write
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_sku.py
new file mode 100644
index 000000000000..802ea83e4151
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_sku.py
@@ -0,0 +1,42 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class DiskSku(Model):
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, StandardSSD_LRS, or
+    UltraSSD_LRS.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param name: The sku name. Possible values include: 'Standard_LRS',
+     'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
+    :type name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.DiskStorageAccountTypes
+    :ivar tier: The sku tier. Default value: "Standard" .
+    :vartype tier: str
+    """
+
+    _validation = {
+        'tier': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskSku, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.tier = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_sku_py3.py
new file mode 100644
index 000000000000..2a98570cde4d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_sku_py3.py
@@ -0,0 +1,42 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class DiskSku(Model):
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, StandardSSD_LRS, or
+    UltraSSD_LRS.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param name: The sku name. Possible values include: 'Standard_LRS',
+     'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
+    :type name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.DiskStorageAccountTypes
+    :ivar tier: The sku tier. Default value: "Standard" .
+    :vartype tier: str
+    """
+
+    _validation = {
+        'tier': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+    }
+
+    def __init__(self, *, name=None, **kwargs) -> None:
+        super(DiskSku, self).__init__(**kwargs)
+        self.name = name
+        self.tier = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_update.py
new file mode 100644
index 000000000000..13e8753cefb7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_update.py
@@ -0,0 +1,63 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class DiskUpdate(Model):
+    """Disk update resource.
+
+    :param os_type: the Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :param disk_iops_read_write: The number of IOPS allowed for this disk;
+     only settable for UltraSSD disks. One operation can transfer between 4k
+     and 256k bytes.
+    :type disk_iops_read_write: long
+    :param disk_mbps_read_write: The bandwidth allowed for this disk; only
+     settable for UltraSSD disks. MBps means millions of bytes per second - MB
+     here uses the ISO notation, of powers of 10.
+    :type disk_mbps_read_write: int
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.DiskSku
+    """
+
+    _attribute_map = {
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'disk_iops_read_write': {'key': 'properties.diskIOPSReadWrite', 'type': 'long'},
+        'disk_mbps_read_write': {'key': 'properties.diskMBpsReadWrite', 'type': 'int'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskUpdate, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.disk_iops_read_write = kwargs.get('disk_iops_read_write', None)
+        self.disk_mbps_read_write = kwargs.get('disk_mbps_read_write', None)
+        self.tags = kwargs.get('tags', None)
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_update_py3.py
new file mode 100644
index 000000000000..ed3cd1f878e0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_update_py3.py
@@ -0,0 +1,63 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class DiskUpdate(Model):
+    """Disk update resource.
+
+    :param os_type: the Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :param disk_iops_read_write: The number of IOPS allowed for this disk;
+     only settable for UltraSSD disks. One operation can transfer between 4k
+     and 256k bytes.
+    :type disk_iops_read_write: long
+    :param disk_mbps_read_write: The bandwidth allowed for this disk; only
+     settable for UltraSSD disks. MBps means millions of bytes per second - MB
+     here uses the ISO notation, of powers of 10.
+    :type disk_mbps_read_write: int
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.DiskSku
+    """
+
+    _attribute_map = {
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'disk_iops_read_write': {'key': 'properties.diskIOPSReadWrite', 'type': 'long'},
+        'disk_mbps_read_write': {'key': 'properties.diskMBpsReadWrite', 'type': 'int'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
+    }
+
+    def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=None, disk_iops_read_write: int=None, disk_mbps_read_write: int=None, tags=None, sku=None, **kwargs) -> None:
+        super(DiskUpdate, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.disk_size_gb = disk_size_gb
+        self.encryption_settings = encryption_settings
+        self.disk_iops_read_write = disk_iops_read_write
+        self.disk_mbps_read_write = disk_mbps_read_write
+        self.tags = tags
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/encryption_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/encryption_settings.py
new file mode 100644
index 000000000000..14584c01005c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/encryption_settings.py
@@ -0,0 +1,44 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class EncryptionSettings(Model):
+    """Encryption settings for disk or snapshot.
+
+    :param enabled: Set this flag to true and provide DiskEncryptionKey and
+     optional KeyEncryptionKey to enable encryption. Set this flag to false and
+     remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If
+     EncryptionSettings is null in the request object, the existing settings
+     remain unchanged.
+    :type enabled: bool
+    :param disk_encryption_key: Key Vault Secret Url and vault id of the disk
+     encryption key
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultAndSecretReference
+    :param key_encryption_key: Key Vault Key Url and vault id of the key
+     encryption key
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultAndKeyReference
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultAndSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultAndKeyReference'},
+    }
+
+    def __init__(self, **kwargs):
+        super(EncryptionSettings, self).__init__(**kwargs)
+        self.enabled = kwargs.get('enabled', None)
+        self.disk_encryption_key = kwargs.get('disk_encryption_key', None)
+        self.key_encryption_key = kwargs.get('key_encryption_key', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/encryption_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/encryption_settings_py3.py
new file mode 100644
index 000000000000..94d40ae9eebe
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/encryption_settings_py3.py
@@ -0,0 +1,44 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class EncryptionSettings(Model):
+    """Encryption settings for disk or snapshot.
+
+    :param enabled: Set this flag to true and provide DiskEncryptionKey and
+     optional KeyEncryptionKey to enable encryption. Set this flag to false and
+     remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If
+     EncryptionSettings is null in the request object, the existing settings
+     remain unchanged.
+    :type enabled: bool
+    :param disk_encryption_key: Key Vault Secret Url and vault id of the disk
+     encryption key
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultAndSecretReference
+    :param key_encryption_key: Key Vault Key Url and vault id of the key
+     encryption key
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultAndKeyReference
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultAndSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultAndKeyReference'},
+    }
+
+    def __init__(self, *, enabled: bool=None, disk_encryption_key=None, key_encryption_key=None, **kwargs) -> None:
+        super(EncryptionSettings, self).__init__(**kwargs)
+        self.enabled = enabled
+        self.disk_encryption_key = disk_encryption_key
+        self.key_encryption_key = key_encryption_key
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base.py
index 8b01e7c2da2c..bb59422b13cb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base.py
@@ -15,18 +15,26 @@
 class GalleryArtifactPublishingProfileBase(Model):
     """Describes the basic gallery artifact publishing profile.
 
-    :param regions: The regions where the artifact is going to be published.
-    :type regions: list[str]
-    :param source:
+    All required parameters must be populated in order to send to Azure.
+
+    :param target_regions: The target regions where the artifact is going to
+     be published.
+    :type target_regions:
+     list[~azure.mgmt.compute.v2018_06_01.models.TargetRegion]
+    :param source: Required.
     :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
     """
 
+    _validation = {
+        'source': {'required': True},
+    }
+
     _attribute_map = {
-        'regions': {'key': 'regions', 'type': '[str]'},
+        'target_regions': {'key': 'targetRegions', 'type': '[TargetRegion]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryArtifactPublishingProfileBase, self).__init__(**kwargs)
-        self.regions = kwargs.get('regions', None)
+        self.target_regions = kwargs.get('target_regions', None)
         self.source = kwargs.get('source', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base_py3.py
index 5a69aa10ec9e..335f17f5793c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base_py3.py
@@ -15,18 +15,26 @@
 class GalleryArtifactPublishingProfileBase(Model):
     """Describes the basic gallery artifact publishing profile.
 
-    :param regions: The regions where the artifact is going to be published.
-    :type regions: list[str]
-    :param source:
+    All required parameters must be populated in order to send to Azure.
+
+    :param target_regions: The target regions where the artifact is going to
+     be published.
+    :type target_regions:
+     list[~azure.mgmt.compute.v2018_06_01.models.TargetRegion]
+    :param source: Required.
     :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
     """
 
+    _validation = {
+        'source': {'required': True},
+    }
+
     _attribute_map = {
-        'regions': {'key': 'regions', 'type': '[str]'},
+        'target_regions': {'key': 'targetRegions', 'type': '[TargetRegion]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
     }
 
-    def __init__(self, *, regions=None, source=None, **kwargs) -> None:
+    def __init__(self, *, source, target_regions=None, **kwargs) -> None:
         super(GalleryArtifactPublishingProfileBase, self).__init__(**kwargs)
-        self.regions = regions
+        self.target_regions = target_regions
         self.source = source
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source.py
index a4b32f9ccb89..d0a6d0fee7f2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source.py
@@ -15,11 +15,17 @@
 class GalleryArtifactSource(Model):
     """The source of the gallery artifact.
 
-    :param managed_image:
+    All required parameters must be populated in order to send to Azure.
+
+    :param managed_image: Required.
     :type managed_image:
      ~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
     """
 
+    _validation = {
+        'managed_image': {'required': True},
+    }
+
     _attribute_map = {
         'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
     }
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source_py3.py
index 77e793f91b43..2fe76b0a2bf2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source_py3.py
@@ -15,15 +15,21 @@
 class GalleryArtifactSource(Model):
     """The source of the gallery artifact.
 
-    :param managed_image:
+    All required parameters must be populated in order to send to Azure.
+
+    :param managed_image: Required.
     :type managed_image:
      ~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
     """
 
+    _validation = {
+        'managed_image': {'required': True},
+    }
+
     _attribute_map = {
         'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
     }
 
-    def __init__(self, *, managed_image=None, **kwargs) -> None:
+    def __init__(self, *, managed_image, **kwargs) -> None:
         super(GalleryArtifactSource, self).__init__(**kwargs)
         self.managed_image = managed_image
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image.py
index 21af4252c4bf..5f019792c881 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image.py
@@ -39,19 +39,19 @@ class GalleryImage(Resource):
     :type privacy_statement_uri: str
     :param release_note_uri: The release note uri.
     :type release_note_uri: str
-    :param os_type: This property allows you to specify the type of the OS
-     that is included in the disk if creating a VM from user-image or a
+    :param os_type: Required. This property allows you to specify the type of
+     the OS that is included in the disk if creating a VM from user-image or a
      specialized VHD. <br><br> Possible values are: <br><br> **Windows**
      <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
     :type os_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
-    :param os_state: The OS State. Possible values include: 'Generalized',
-     'Specialized'
+    :param os_state: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
     :type os_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemStateTypes
     :param end_of_life_date: The end of life of this gallery image.
     :type end_of_life_date: datetime
-    :param identifier:
+    :param identifier: Required.
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
     :param recommended:
@@ -75,6 +75,9 @@ class GalleryImage(Resource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'location': {'required': True},
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+        'identifier': {'required': True},
         'provisioning_state': {'readonly': True},
     }
 
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier.py
index 2f27b4d520aa..0a3e89879504 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier.py
@@ -15,14 +15,22 @@
 class GalleryImageIdentifier(Model):
     """This is the gallery image identifier.
 
-    :param publisher: The gallery image publisher name.
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The gallery image publisher name.
     :type publisher: str
-    :param offer: The gallery image offer name.
+    :param offer: Required. The gallery image offer name.
     :type offer: str
-    :param sku: The gallery image sku name.
+    :param sku: Required. The gallery image sku name.
     :type sku: str
     """
 
+    _validation = {
+        'publisher': {'required': True},
+        'offer': {'required': True},
+        'sku': {'required': True},
+    }
+
     _attribute_map = {
         'publisher': {'key': 'publisher', 'type': 'str'},
         'offer': {'key': 'offer', 'type': 'str'},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier_py3.py
index b858e464271c..4d48b4b4f889 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier_py3.py
@@ -15,21 +15,29 @@
 class GalleryImageIdentifier(Model):
     """This is the gallery image identifier.
 
-    :param publisher: The gallery image publisher name.
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The gallery image publisher name.
     :type publisher: str
-    :param offer: The gallery image offer name.
+    :param offer: Required. The gallery image offer name.
     :type offer: str
-    :param sku: The gallery image sku name.
+    :param sku: Required. The gallery image sku name.
     :type sku: str
     """
 
+    _validation = {
+        'publisher': {'required': True},
+        'offer': {'required': True},
+        'sku': {'required': True},
+    }
+
     _attribute_map = {
         'publisher': {'key': 'publisher', 'type': 'str'},
         'offer': {'key': 'offer', 'type': 'str'},
         'sku': {'key': 'sku', 'type': 'str'},
     }
 
-    def __init__(self, *, publisher: str=None, offer: str=None, sku: str=None, **kwargs) -> None:
+    def __init__(self, *, publisher: str, offer: str, sku: str, **kwargs) -> None:
         super(GalleryImageIdentifier, self).__init__(**kwargs)
         self.publisher = publisher
         self.offer = offer
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_py3.py
index ea37cbf9541b..d263e80f3e1e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_py3.py
@@ -39,19 +39,19 @@ class GalleryImage(Resource):
     :type privacy_statement_uri: str
     :param release_note_uri: The release note uri.
     :type release_note_uri: str
-    :param os_type: This property allows you to specify the type of the OS
-     that is included in the disk if creating a VM from user-image or a
+    :param os_type: Required. This property allows you to specify the type of
+     the OS that is included in the disk if creating a VM from user-image or a
      specialized VHD. <br><br> Possible values are: <br><br> **Windows**
      <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
     :type os_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
-    :param os_state: The OS State. Possible values include: 'Generalized',
-     'Specialized'
+    :param os_state: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
     :type os_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemStateTypes
     :param end_of_life_date: The end of life of this gallery image.
     :type end_of_life_date: datetime
-    :param identifier:
+    :param identifier: Required.
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
     :param recommended:
@@ -75,6 +75,9 @@ class GalleryImage(Resource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'location': {'required': True},
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+        'identifier': {'required': True},
         'provisioning_state': {'readonly': True},
     }
 
@@ -98,7 +101,7 @@ class GalleryImage(Resource):
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
 
-    def __init__(self, *, location: str, tags=None, description: str=None, eula: str=None, privacy_statement_uri: str=None, release_note_uri: str=None, os_type=None, os_state=None, end_of_life_date=None, identifier=None, recommended=None, disallowed=None, purchase_plan=None, **kwargs) -> None:
+    def __init__(self, *, location: str, os_type, os_state, identifier, tags=None, description: str=None, eula: str=None, privacy_statement_uri: str=None, release_note_uri: str=None, end_of_life_date=None, recommended=None, disallowed=None, purchase_plan=None, **kwargs) -> None:
         super(GalleryImage, self).__init__(location=location, tags=tags, **kwargs)
         self.description = description
         self.eula = eula
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version.py
index 69cdf916c67b..b470e70077a9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version.py
@@ -31,7 +31,7 @@ class GalleryImageVersion(Resource):
     :type location: str
     :param tags: Resource tags
     :type tags: dict[str, str]
-    :param publishing_profile:
+    :param publishing_profile: Required.
     :type publishing_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionPublishingProfile
     :ivar provisioning_state: The current state of the gallery image version.
@@ -53,6 +53,7 @@ class GalleryImageVersion(Resource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'location': {'required': True},
+        'publishing_profile': {'required': True},
         'provisioning_state': {'readonly': True},
         'storage_profile': {'readonly': True},
         'replication_status': {'readonly': True},
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile.py
index e475a6192ec7..c5e3be1292a9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile.py
@@ -18,13 +18,17 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :param regions: The regions where the artifact is going to be published.
-    :type regions: list[str]
-    :param source:
+    All required parameters must be populated in order to send to Azure.
+
+    :param target_regions: The target regions where the artifact is going to
+     be published.
+    :type target_regions:
+     list[~azure.mgmt.compute.v2018_06_01.models.TargetRegion]
+    :param source: Required.
     :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
-    :param scale_tier: The scale tier of the gallery image version. Valid
-     values are 'S30' and 'S100'. Possible values include: 'S30', 'S100'
-    :type scale_tier: str or ~azure.mgmt.compute.v2018_06_01.models.ScaleTier
+    :param replica_count: This is the number of source blob copies in a
+     region.
+    :type replica_count: int
     :param exclude_from_latest: The flag means that if it is set to true,
      people deploying VMs with 'latest' as version will not use this version.
     :type exclude_from_latest: bool
@@ -37,13 +41,14 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     """
 
     _validation = {
+        'source': {'required': True},
         'published_date': {'readonly': True},
     }
 
     _attribute_map = {
-        'regions': {'key': 'regions', 'type': '[str]'},
+        'target_regions': {'key': 'targetRegions', 'type': '[TargetRegion]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
-        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
+        'replica_count': {'key': 'replicaCount', 'type': 'int'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
         'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
         'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
@@ -51,7 +56,7 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
 
     def __init__(self, **kwargs):
         super(GalleryImageVersionPublishingProfile, self).__init__(**kwargs)
-        self.scale_tier = kwargs.get('scale_tier', None)
+        self.replica_count = kwargs.get('replica_count', None)
         self.exclude_from_latest = kwargs.get('exclude_from_latest', None)
         self.published_date = None
         self.end_of_life_date = kwargs.get('end_of_life_date', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile_py3.py
index 13b13fdd244f..54fee2cc6da8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile_py3.py
@@ -18,13 +18,17 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :param regions: The regions where the artifact is going to be published.
-    :type regions: list[str]
-    :param source:
+    All required parameters must be populated in order to send to Azure.
+
+    :param target_regions: The target regions where the artifact is going to
+     be published.
+    :type target_regions:
+     list[~azure.mgmt.compute.v2018_06_01.models.TargetRegion]
+    :param source: Required.
     :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
-    :param scale_tier: The scale tier of the gallery image version. Valid
-     values are 'S30' and 'S100'. Possible values include: 'S30', 'S100'
-    :type scale_tier: str or ~azure.mgmt.compute.v2018_06_01.models.ScaleTier
+    :param replica_count: This is the number of source blob copies in a
+     region.
+    :type replica_count: int
     :param exclude_from_latest: The flag means that if it is set to true,
      people deploying VMs with 'latest' as version will not use this version.
     :type exclude_from_latest: bool
@@ -37,21 +41,22 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     """
 
     _validation = {
+        'source': {'required': True},
         'published_date': {'readonly': True},
     }
 
     _attribute_map = {
-        'regions': {'key': 'regions', 'type': '[str]'},
+        'target_regions': {'key': 'targetRegions', 'type': '[TargetRegion]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
-        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
+        'replica_count': {'key': 'replicaCount', 'type': 'int'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
         'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
         'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
     }
 
-    def __init__(self, *, regions=None, source=None, scale_tier=None, exclude_from_latest: bool=None, end_of_life_date=None, **kwargs) -> None:
-        super(GalleryImageVersionPublishingProfile, self).__init__(regions=regions, source=source, **kwargs)
-        self.scale_tier = scale_tier
+    def __init__(self, *, source, target_regions=None, replica_count: int=None, exclude_from_latest: bool=None, end_of_life_date=None, **kwargs) -> None:
+        super(GalleryImageVersionPublishingProfile, self).__init__(target_regions=target_regions, source=source, **kwargs)
+        self.replica_count = replica_count
         self.exclude_from_latest = exclude_from_latest
         self.published_date = None
         self.end_of_life_date = end_of_life_date
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_py3.py
index b01071bd2279..ada04160caf9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_py3.py
@@ -31,7 +31,7 @@ class GalleryImageVersion(Resource):
     :type location: str
     :param tags: Resource tags
     :type tags: dict[str, str]
-    :param publishing_profile:
+    :param publishing_profile: Required.
     :type publishing_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionPublishingProfile
     :ivar provisioning_state: The current state of the gallery image version.
@@ -53,6 +53,7 @@ class GalleryImageVersion(Resource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'location': {'required': True},
+        'publishing_profile': {'required': True},
         'provisioning_state': {'readonly': True},
         'storage_profile': {'readonly': True},
         'replication_status': {'readonly': True},
@@ -70,7 +71,7 @@ class GalleryImageVersion(Resource):
         'replication_status': {'key': 'properties.replicationStatus', 'type': 'ReplicationStatus'},
     }
 
-    def __init__(self, *, location: str, tags=None, publishing_profile=None, **kwargs) -> None:
+    def __init__(self, *, location: str, publishing_profile, tags=None, **kwargs) -> None:
         super(GalleryImageVersion, self).__init__(location=location, tags=tags, **kwargs)
         self.publishing_profile = publishing_profile
         self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/grant_access_data.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/grant_access_data.py
new file mode 100644
index 000000000000..39d400ba48f5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/grant_access_data.py
@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class GrantAccessData(Model):
+    """Data used for requesting a SAS.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param access: Required. Possible values include: 'None', 'Read'
+    :type access: str or ~azure.mgmt.compute.v2018_06_01.models.AccessLevel
+    :param duration_in_seconds: Required. Time duration in seconds until the
+     SAS access expires.
+    :type duration_in_seconds: int
+    """
+
+    _validation = {
+        'access': {'required': True},
+        'duration_in_seconds': {'required': True},
+    }
+
+    _attribute_map = {
+        'access': {'key': 'access', 'type': 'str'},
+        'duration_in_seconds': {'key': 'durationInSeconds', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GrantAccessData, self).__init__(**kwargs)
+        self.access = kwargs.get('access', None)
+        self.duration_in_seconds = kwargs.get('duration_in_seconds', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/grant_access_data_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/grant_access_data_py3.py
new file mode 100644
index 000000000000..fe8ce77f24ee
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/grant_access_data_py3.py
@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class GrantAccessData(Model):
+    """Data used for requesting a SAS.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param access: Required. Possible values include: 'None', 'Read'
+    :type access: str or ~azure.mgmt.compute.v2018_06_01.models.AccessLevel
+    :param duration_in_seconds: Required. Time duration in seconds until the
+     SAS access expires.
+    :type duration_in_seconds: int
+    """
+
+    _validation = {
+        'access': {'required': True},
+        'duration_in_seconds': {'required': True},
+    }
+
+    _attribute_map = {
+        'access': {'key': 'access', 'type': 'str'},
+        'duration_in_seconds': {'key': 'durationInSeconds', 'type': 'int'},
+    }
+
+    def __init__(self, *, access, duration_in_seconds: int, **kwargs) -> None:
+        super(GrantAccessData, self).__init__(**kwargs)
+        self.access = access
+        self.duration_in_seconds = duration_in_seconds
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk.py
index ef006422c907..4bfaaa550c3d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk.py
@@ -39,7 +39,7 @@ class ImageDataDisk(Model):
     :param storage_account_type: Specifies the storage account type for the
      managed disk. Possible values are: Standard_LRS, Premium_LRS, and
      StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     'StandardSSD_LRS', 'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk_py3.py
index ca60113b45bf..6f612bf9ca37 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk_py3.py
@@ -39,7 +39,7 @@ class ImageDataDisk(Model):
     :param storage_account_type: Specifies the storage account type for the
      managed disk. Possible values are: Standard_LRS, Premium_LRS, and
      StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     'StandardSSD_LRS', 'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_disk_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_disk_reference.py
new file mode 100644
index 000000000000..247d532379fc
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_disk_reference.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ImageDiskReference(Model):
+    """The source image used for creating the disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Required. A relative uri containing either a Platform Imgage
+     Repository or user image reference.
+    :type id: str
+    :param lun: If the disk is created from an image's data disk, this is an
+     index that indicates which of the data disks in the image to use. For OS
+     disks, this field is null.
+    :type lun: int
+    """
+
+    _validation = {
+        'id': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageDiskReference, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
+        self.lun = kwargs.get('lun', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_disk_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_disk_reference_py3.py
new file mode 100644
index 000000000000..191563557acb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_disk_reference_py3.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ImageDiskReference(Model):
+    """The source image used for creating the disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Required. A relative uri containing either a Platform Imgage
+     Repository or user image reference.
+    :type id: str
+    :param lun: If the disk is created from an image's data disk, this is an
+     index that indicates which of the data disks in the image to use. For OS
+     disks, this field is null.
+    :type lun: int
+    """
+
+    _validation = {
+        'id': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, *, id: str, lun: int=None, **kwargs) -> None:
+        super(ImageDiskReference, self).__init__(**kwargs)
+        self.id = id
+        self.lun = lun
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk.py
index 6cf7454c0e37..6ce481da0418 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk.py
@@ -45,7 +45,7 @@ class ImageOSDisk(Model):
     :param storage_account_type: Specifies the storage account type for the
      managed disk. Possible values are: Standard_LRS, Premium_LRS, and
      StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     'StandardSSD_LRS', 'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk_py3.py
index 3f402e67cf9e..f7fdc99b7235 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk_py3.py
@@ -45,7 +45,7 @@ class ImageOSDisk(Model):
     :param storage_account_type: Specifies the storage account type for the
      managed disk. Possible values are: Standard_LRS, Premium_LRS, and
      StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     'StandardSSD_LRS', 'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_key_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_key_reference.py
new file mode 100644
index 000000000000..16ff78c677e4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_key_reference.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class KeyVaultAndKeyReference(Model):
+    """Key Vault Key Url and vault id of KeK, KeK is optional and when provided is
+    used to unwrap the encryptionKey.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param source_vault: Required. Resource id of the KeyVault containing the
+     key or secret
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SourceVault
+    :param key_url: Required. Url pointing to a key or secret in KeyVault
+    :type key_url: str
+    """
+
+    _validation = {
+        'source_vault': {'required': True},
+        'key_url': {'required': True},
+    }
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SourceVault'},
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultAndKeyReference, self).__init__(**kwargs)
+        self.source_vault = kwargs.get('source_vault', None)
+        self.key_url = kwargs.get('key_url', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_key_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_key_reference_py3.py
new file mode 100644
index 000000000000..20a79a09314b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_key_reference_py3.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class KeyVaultAndKeyReference(Model):
+    """Key Vault Key Url and vault id of KeK, KeK is optional and when provided is
+    used to unwrap the encryptionKey.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param source_vault: Required. Resource id of the KeyVault containing the
+     key or secret
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SourceVault
+    :param key_url: Required. Url pointing to a key or secret in KeyVault
+    :type key_url: str
+    """
+
+    _validation = {
+        'source_vault': {'required': True},
+        'key_url': {'required': True},
+    }
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SourceVault'},
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+    }
+
+    def __init__(self, *, source_vault, key_url: str, **kwargs) -> None:
+        super(KeyVaultAndKeyReference, self).__init__(**kwargs)
+        self.source_vault = source_vault
+        self.key_url = key_url
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_secret_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_secret_reference.py
new file mode 100644
index 000000000000..09058d9fe672
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_secret_reference.py
@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class KeyVaultAndSecretReference(Model):
+    """Key Vault Secret Url and vault id of the encryption key .
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param source_vault: Required. Resource id of the KeyVault containing the
+     key or secret
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SourceVault
+    :param secret_url: Required. Url pointing to a key or secret in KeyVault
+    :type secret_url: str
+    """
+
+    _validation = {
+        'source_vault': {'required': True},
+        'secret_url': {'required': True},
+    }
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SourceVault'},
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultAndSecretReference, self).__init__(**kwargs)
+        self.source_vault = kwargs.get('source_vault', None)
+        self.secret_url = kwargs.get('secret_url', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_secret_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_secret_reference_py3.py
new file mode 100644
index 000000000000..1266a3f8bc01
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_and_secret_reference_py3.py
@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class KeyVaultAndSecretReference(Model):
+    """Key Vault Secret Url and vault id of the encryption key .
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param source_vault: Required. Resource id of the KeyVault containing the
+     key or secret
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SourceVault
+    :param secret_url: Required. Url pointing to a key or secret in KeyVault
+    :type secret_url: str
+    """
+
+    _validation = {
+        'source_vault': {'required': True},
+        'secret_url': {'required': True},
+    }
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SourceVault'},
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+    }
+
+    def __init__(self, *, source_vault, secret_url: str, **kwargs) -> None:
+        super(KeyVaultAndSecretReference, self).__init__(**kwargs)
+        self.source_vault = source_vault
+        self.secret_url = secret_url
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact.py
index 75d0cf2708c0..753e9704d755 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact.py
@@ -15,10 +15,16 @@
 class ManagedArtifact(Model):
     """The managed artifact.
 
-    :param id: The managed artifact id.
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Required. The managed artifact id.
     :type id: str
     """
 
+    _validation = {
+        'id': {'required': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
     }
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact_py3.py
index 2afb7d06ce6a..0e8a6b2bfa40 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact_py3.py
@@ -15,14 +15,20 @@
 class ManagedArtifact(Model):
     """The managed artifact.
 
-    :param id: The managed artifact id.
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Required. The managed artifact id.
     :type id: str
     """
 
+    _validation = {
+        'id': {'required': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str=None, **kwargs) -> None:
+    def __init__(self, *, id: str, **kwargs) -> None:
         super(ManagedArtifact, self).__init__(**kwargs)
         self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters.py
index 0880da4ab1b8..41d023a94be0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters.py
@@ -18,9 +18,9 @@ class ManagedDiskParameters(SubResource):
     :param id: Resource Id
     :type id: str
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
-     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     managed disk. UltraSSD_LRS can only be used for data disks. Possible
+     values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS',
+     'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters_py3.py
index f2c1408ccaab..50e3273c5d0a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters_py3.py
@@ -18,9 +18,9 @@ class ManagedDiskParameters(SubResource):
     :param id: Resource Id
     :type id: str
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
-     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     managed disk. UltraSSD_LRS can only be used for data disks. Possible
+     values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS',
+     'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk.py
index 8b399ec2aa04..b4fed8c2c1cd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk.py
@@ -58,7 +58,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_py3.py
index 0c71fd4cab9b..7dc498d4d7d0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_py3.py
@@ -58,7 +58,7 @@ class OSDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py
index d8b5954ac92b..5c07709435e0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py
@@ -15,9 +15,7 @@
 class Sku(Model):
     """Describes a virtual machine scale set sku.
 
-    :param name: The sku name. Possible values are: **Aligned** for managed
-     disks, and **Classic** for unmanaged disks. Default value is Classic, if
-     not specified.
+    :param name: The sku name.
     :type name: str
     :param tier: Specifies the tier of virtual machines in a scale set.<br
      /><br /> Possible Values:<br /><br /> **Standard**<br /><br /> **Basic**
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py
index 781632d90337..f6bc74afaadc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py
@@ -15,9 +15,7 @@
 class Sku(Model):
     """Describes a virtual machine scale set sku.
 
-    :param name: The sku name. Possible values are: **Aligned** for managed
-     disks, and **Classic** for unmanaged disks. Default value is Classic, if
-     not specified.
+    :param name: The sku name.
     :type name: str
     :param tier: Specifies the tier of virtual machines in a scale set.<br
      /><br /> Possible Values:<br /><br /> **Standard**<br /><br /> **Basic**
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot.py
new file mode 100644
index 000000000000..ff5d5014d273
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot.py
@@ -0,0 +1,95 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .resource import Resource
+
+
+class Snapshot(Resource):
+    """Snapshot resource.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :param location: Required. Resource location
+    :type location: str
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :ivar managed_by: Unused. Always Null.
+    :vartype managed_by: str
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.SnapshotSku
+    :ivar time_created: The time when the disk was created.
+    :vartype time_created: datetime
+    :param os_type: The Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param creation_data: Required. Disk source information. CreationData
+     information cannot be changed after the disk has been created.
+    :type creation_data: ~azure.mgmt.compute.v2018_06_01.models.CreationData
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :ivar provisioning_state: The disk provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'managed_by': {'readonly': True},
+        'time_created': {'readonly': True},
+        'creation_data': {'required': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'managed_by': {'key': 'managedBy', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'SnapshotSku'},
+        'time_created': {'key': 'properties.timeCreated', 'type': 'iso-8601'},
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'creation_data': {'key': 'properties.creationData', 'type': 'CreationData'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Snapshot, self).__init__(**kwargs)
+        self.managed_by = None
+        self.sku = kwargs.get('sku', None)
+        self.time_created = None
+        self.os_type = kwargs.get('os_type', None)
+        self.creation_data = kwargs.get('creation_data', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_paged.py
new file mode 100644
index 000000000000..250970ea9f6b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_paged.py
@@ -0,0 +1,27 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.paging import Paged
+
+
+class SnapshotPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Snapshot <azure.mgmt.compute.v2018_06_01.models.Snapshot>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Snapshot]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(SnapshotPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_py3.py
new file mode 100644
index 000000000000..8921a3c46991
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_py3.py
@@ -0,0 +1,95 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .resource_py3 import Resource
+
+
+class Snapshot(Resource):
+    """Snapshot resource.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :param location: Required. Resource location
+    :type location: str
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :ivar managed_by: Unused. Always Null.
+    :vartype managed_by: str
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.SnapshotSku
+    :ivar time_created: The time when the disk was created.
+    :vartype time_created: datetime
+    :param os_type: The Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param creation_data: Required. Disk source information. CreationData
+     information cannot be changed after the disk has been created.
+    :type creation_data: ~azure.mgmt.compute.v2018_06_01.models.CreationData
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :ivar provisioning_state: The disk provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'managed_by': {'readonly': True},
+        'time_created': {'readonly': True},
+        'creation_data': {'required': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'managed_by': {'key': 'managedBy', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'SnapshotSku'},
+        'time_created': {'key': 'properties.timeCreated', 'type': 'iso-8601'},
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'creation_data': {'key': 'properties.creationData', 'type': 'CreationData'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, location: str, creation_data, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
+        super(Snapshot, self).__init__(location=location, tags=tags, **kwargs)
+        self.managed_by = None
+        self.sku = sku
+        self.time_created = None
+        self.os_type = os_type
+        self.creation_data = creation_data
+        self.disk_size_gb = disk_size_gb
+        self.encryption_settings = encryption_settings
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_sku.py
new file mode 100644
index 000000000000..d73b6283b82c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_sku.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SnapshotSku(Model):
+    """The snapshots sku name. Can be Standard_LRS, Premium_LRS, or Standard_ZRS.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param name: The sku name. Possible values include: 'Standard_LRS',
+     'Premium_LRS', 'Standard_ZRS'
+    :type name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.SnapshotStorageAccountTypes
+    :ivar tier: The sku tier. Default value: "Standard" .
+    :vartype tier: str
+    """
+
+    _validation = {
+        'tier': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SnapshotSku, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.tier = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_sku_py3.py
new file mode 100644
index 000000000000..55d281f87d30
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_sku_py3.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SnapshotSku(Model):
+    """The snapshots sku name. Can be Standard_LRS, Premium_LRS, or Standard_ZRS.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param name: The sku name. Possible values include: 'Standard_LRS',
+     'Premium_LRS', 'Standard_ZRS'
+    :type name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.SnapshotStorageAccountTypes
+    :ivar tier: The sku tier. Default value: "Standard" .
+    :vartype tier: str
+    """
+
+    _validation = {
+        'tier': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+    }
+
+    def __init__(self, *, name=None, **kwargs) -> None:
+        super(SnapshotSku, self).__init__(**kwargs)
+        self.name = name
+        self.tier = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_update.py
new file mode 100644
index 000000000000..cfc9634ccf54
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_update.py
@@ -0,0 +1,51 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SnapshotUpdate(Model):
+    """Snapshot update resource.
+
+    :param os_type: the Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.SnapshotSku
+    """
+
+    _attribute_map = {
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'SnapshotSku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SnapshotUpdate, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.tags = kwargs.get('tags', None)
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_update_py3.py
new file mode 100644
index 000000000000..d5b3ec204313
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/snapshot_update_py3.py
@@ -0,0 +1,51 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SnapshotUpdate(Model):
+    """Snapshot update resource.
+
+    :param os_type: the Operating System type. Possible values include:
+     'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param disk_size_gb: If creationData.createOption is Empty, this field is
+     mandatory and it indicates the size of the VHD to create. If this field is
+     present for updates or creation with other options, it indicates a resize.
+     Resizes are only allowed if the disk is not attached to a running VM, and
+     can only increase the disk's size.
+    :type disk_size_gb: int
+    :param encryption_settings: Encryption settings for disk or snapshot
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.SnapshotSku
+    """
+
+    _attribute_map = {
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
+        'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'SnapshotSku'},
+    }
+
+    def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=None, tags=None, sku=None, **kwargs) -> None:
+        super(SnapshotUpdate, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.disk_size_gb = disk_size_gb
+        self.encryption_settings = encryption_settings
+        self.tags = tags
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/source_vault.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/source_vault.py
new file mode 100644
index 000000000000..9b16302ebbfb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/source_vault.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SourceVault(Model):
+    """The vault id is an Azure Resource Manager Resoure id in the form
+    /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SourceVault, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/source_vault_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/source_vault_py3.py
new file mode 100644
index 000000000000..13eea5461390
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/source_vault_py3.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SourceVault(Model):
+    """The vault id is an Azure Resource Manager Resoure id in the form
+    /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(SourceVault, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/target_region.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/target_region.py
new file mode 100644
index 000000000000..6c1343cd129c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/target_region.py
@@ -0,0 +1,33 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class TargetRegion(Model):
+    """Describes the target region information.
+
+    :param name: The name of the region.
+    :type name: str
+    :param regional_replica_count: This is the number of source blob copies in
+     this specific region.
+    :type regional_replica_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'regional_replica_count': {'key': 'regionalReplicaCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(TargetRegion, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.regional_replica_count = kwargs.get('regional_replica_count', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/target_region_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/target_region_py3.py
new file mode 100644
index 000000000000..3a307a116d4d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/target_region_py3.py
@@ -0,0 +1,33 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class TargetRegion(Model):
+    """Describes the target region information.
+
+    :param name: The name of the region.
+    :type name: str
+    :param regional_replica_count: This is the number of source blob copies in
+     this specific region.
+    :type regional_replica_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'regional_replica_count': {'key': 'regionalReplicaCount', 'type': 'int'},
+    }
+
+    def __init__(self, *, name: str=None, regional_replica_count: int=None, **kwargs) -> None:
+        super(TargetRegion, self).__init__(**kwargs)
+        self.name = name
+        self.regional_replica_count = regional_replica_count
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine.py
index 5ba0756820ef..d0f2e256fb12 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine.py
@@ -46,6 +46,12 @@ class VirtualMachine(Resource):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine. For instance: whether the virtual
+     machine has the capability to support attaching managed data disks with
+     UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param os_profile: Specifies the operating system settings for the virtual
      machine.
     :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
@@ -119,6 +125,7 @@ class VirtualMachine(Resource):
         'plan': {'key': 'plan', 'type': 'Plan'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
         'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
@@ -137,6 +144,7 @@ def __init__(self, **kwargs):
         self.plan = kwargs.get('plan', None)
         self.hardware_profile = kwargs.get('hardware_profile', None)
         self.storage_profile = kwargs.get('storage_profile', None)
+        self.additional_capabilities = kwargs.get('additional_capabilities', None)
         self.os_profile = kwargs.get('os_profile', None)
         self.network_profile = kwargs.get('network_profile', None)
         self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_py3.py
index 0ac76ecae240..b9c9658ce5bc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_py3.py
@@ -46,6 +46,12 @@ class VirtualMachine(Resource):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine. For instance: whether the virtual
+     machine has the capability to support attaching managed data disks with
+     UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param os_profile: Specifies the operating system settings for the virtual
      machine.
     :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
@@ -119,6 +125,7 @@ class VirtualMachine(Resource):
         'plan': {'key': 'plan', 'type': 'Plan'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
         'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
@@ -132,11 +139,12 @@ class VirtualMachine(Resource):
         'zones': {'key': 'zones', 'type': '[str]'},
     }
 
-    def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None, storage_profile=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None:
         super(VirtualMachine, self).__init__(location=location, tags=tags, **kwargs)
         self.plan = plan
         self.hardware_profile = hardware_profile
         self.storage_profile = storage_profile
+        self.additional_capabilities = additional_capabilities
         self.os_profile = os_profile
         self.network_profile = network_profile
         self.diagnostics_profile = diagnostics_profile
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk.py
index a4280ab06217..48791267028c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk.py
@@ -36,7 +36,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk_py3.py
index eb40c17afad2..92a530925ba5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk_py3.py
@@ -36,7 +36,7 @@ class VirtualMachineScaleSetDataDisk(Model):
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
     :param disk_size_gb: Specifies the size of an empty data disk in
-     gigabytes. This element can be used to overwrite the name of the disk in a
+     gigabytes. This element can be used to overwrite the size of the disk in a
      virtual machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param managed_disk: The managed disk parameters.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters.py
index d3194e273ccb..bd63a7ca4295 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -18,7 +18,7 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     :param storage_account_type: Specifies the storage account type for the
      managed disk. Possible values are: Standard_LRS, Premium_LRS, and
      StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     'StandardSSD_LRS', 'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
index 517afc8e40d4..2fc6dd798d98 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -18,7 +18,7 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     :param storage_account_type: Specifies the storage account type for the
      managed disk. Possible values are: Standard_LRS, Premium_LRS, and
      StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
-     'StandardSSD_LRS'
+     'StandardSSD_LRS', 'UltraSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk.py
index b6c87a946f94..7a1676cfe1e3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk.py
@@ -36,6 +36,10 @@ class VirtualMachineScaleSetOSDisk(Model):
      Possible values include: 'FromImage', 'Empty', 'Attach'
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
+    :param disk_size_gb: Specifies the size of the operating system disk in
+     gigabytes. This element can be used to overwrite the size of the disk in a
+     virtual machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
     :param os_type: This property allows you to specify the type of the OS
      that is included in the disk if creating a VM from user-image or a
      specialized VHD. <br><br> Possible values are: <br><br> **Windows**
@@ -62,6 +66,7 @@ class VirtualMachineScaleSetOSDisk(Model):
         'caching': {'key': 'caching', 'type': 'CachingTypes'},
         'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
         'create_option': {'key': 'createOption', 'type': 'str'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
         'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
         'image': {'key': 'image', 'type': 'VirtualHardDisk'},
         'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
@@ -74,6 +79,7 @@ def __init__(self, **kwargs):
         self.caching = kwargs.get('caching', None)
         self.write_accelerator_enabled = kwargs.get('write_accelerator_enabled', None)
         self.create_option = kwargs.get('create_option', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
         self.os_type = kwargs.get('os_type', None)
         self.image = kwargs.get('image', None)
         self.vhd_containers = kwargs.get('vhd_containers', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk_py3.py
index 051ec3187023..5b44c8e2e8f9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk_py3.py
@@ -36,6 +36,10 @@ class VirtualMachineScaleSetOSDisk(Model):
      Possible values include: 'FromImage', 'Empty', 'Attach'
     :type create_option: str or
      ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
+    :param disk_size_gb: Specifies the size of the operating system disk in
+     gigabytes. This element can be used to overwrite the size of the disk in a
+     virtual machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
     :param os_type: This property allows you to specify the type of the OS
      that is included in the disk if creating a VM from user-image or a
      specialized VHD. <br><br> Possible values are: <br><br> **Windows**
@@ -62,18 +66,20 @@ class VirtualMachineScaleSetOSDisk(Model):
         'caching': {'key': 'caching', 'type': 'CachingTypes'},
         'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
         'create_option': {'key': 'createOption', 'type': 'str'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
         'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
         'image': {'key': 'image', 'type': 'VirtualHardDisk'},
         'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
         'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
     }
 
-    def __init__(self, *, create_option, name: str=None, caching=None, write_accelerator_enabled: bool=None, os_type=None, image=None, vhd_containers=None, managed_disk=None, **kwargs) -> None:
+    def __init__(self, *, create_option, name: str=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, os_type=None, image=None, vhd_containers=None, managed_disk=None, **kwargs) -> None:
         super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
         self.name = name
         self.caching = caching
         self.write_accelerator_enabled = write_accelerator_enabled
         self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
         self.os_type = os_type
         self.image = image
         self.vhd_containers = vhd_containers
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
index c43e3909c23d..ca667579db68 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
@@ -29,6 +29,9 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
     :param ip_tags: The list of IP tags associated with the public IP address.
     :type ip_tags:
      list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIpTag]
+    :param public_ip_prefix: The PublicIPPrefix from which to allocate
+     publicIP addresses.
+    :type public_ip_prefix: ~azure.mgmt.compute.v2018_06_01.models.SubResource
     """
 
     _validation = {
@@ -40,6 +43,7 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
         'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
         'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
         'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'},
+        'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'SubResource'},
     }
 
     def __init__(self, **kwargs):
@@ -48,3 +52,4 @@ def __init__(self, **kwargs):
         self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
         self.dns_settings = kwargs.get('dns_settings', None)
         self.ip_tags = kwargs.get('ip_tags', None)
+        self.public_ip_prefix = kwargs.get('public_ip_prefix', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
index 1997921b01de..3d6ba42bf5f6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
@@ -29,6 +29,9 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
     :param ip_tags: The list of IP tags associated with the public IP address.
     :type ip_tags:
      list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIpTag]
+    :param public_ip_prefix: The PublicIPPrefix from which to allocate
+     publicIP addresses.
+    :type public_ip_prefix: ~azure.mgmt.compute.v2018_06_01.models.SubResource
     """
 
     _validation = {
@@ -40,11 +43,13 @@ class VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
         'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
         'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
         'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'},
+        'public_ip_prefix': {'key': 'properties.publicIPPrefix', 'type': 'SubResource'},
     }
 
-    def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=None, ip_tags=None, **kwargs) -> None:
+    def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=None, ip_tags=None, public_ip_prefix=None, **kwargs) -> None:
         super(VirtualMachineScaleSetPublicIPAddressConfiguration, self).__init__(**kwargs)
         self.name = name
         self.idle_timeout_in_minutes = idle_timeout_in_minutes
         self.dns_settings = dns_settings
         self.ip_tags = ip_tags
+        self.public_ip_prefix = public_ip_prefix
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk.py
index 8a1968c828c4..1b2702a1659d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk.py
@@ -22,6 +22,10 @@ class VirtualMachineScaleSetUpdateOSDisk(Model):
     :param write_accelerator_enabled: Specifies whether writeAccelerator
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
+    :param disk_size_gb: Specifies the size of the operating system disk in
+     gigabytes. This element can be used to overwrite the size of the disk in a
+     virtual machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
     :param image: The Source User Image VirtualHardDisk. This VirtualHardDisk
      will be copied before using it to attach to the Virtual Machine. If
      SourceImage is provided, the destination VirtualHardDisk should not exist.
@@ -36,6 +40,7 @@ class VirtualMachineScaleSetUpdateOSDisk(Model):
     _attribute_map = {
         'caching': {'key': 'caching', 'type': 'CachingTypes'},
         'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
         'image': {'key': 'image', 'type': 'VirtualHardDisk'},
         'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
         'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
@@ -45,6 +50,7 @@ def __init__(self, **kwargs):
         super(VirtualMachineScaleSetUpdateOSDisk, self).__init__(**kwargs)
         self.caching = kwargs.get('caching', None)
         self.write_accelerator_enabled = kwargs.get('write_accelerator_enabled', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
         self.image = kwargs.get('image', None)
         self.vhd_containers = kwargs.get('vhd_containers', None)
         self.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk_py3.py
index b5b2138e378a..ae479089bf38 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk_py3.py
@@ -22,6 +22,10 @@ class VirtualMachineScaleSetUpdateOSDisk(Model):
     :param write_accelerator_enabled: Specifies whether writeAccelerator
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
+    :param disk_size_gb: Specifies the size of the operating system disk in
+     gigabytes. This element can be used to overwrite the size of the disk in a
+     virtual machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
     :param image: The Source User Image VirtualHardDisk. This VirtualHardDisk
      will be copied before using it to attach to the Virtual Machine. If
      SourceImage is provided, the destination VirtualHardDisk should not exist.
@@ -36,15 +40,17 @@ class VirtualMachineScaleSetUpdateOSDisk(Model):
     _attribute_map = {
         'caching': {'key': 'caching', 'type': 'CachingTypes'},
         'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
         'image': {'key': 'image', 'type': 'VirtualHardDisk'},
         'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
         'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
     }
 
-    def __init__(self, *, caching=None, write_accelerator_enabled: bool=None, image=None, vhd_containers=None, managed_disk=None, **kwargs) -> None:
+    def __init__(self, *, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, image=None, vhd_containers=None, managed_disk=None, **kwargs) -> None:
         super(VirtualMachineScaleSetUpdateOSDisk, self).__init__(**kwargs)
         self.caching = caching
         self.write_accelerator_enabled = write_accelerator_enabled
+        self.disk_size_gb = disk_size_gb
         self.image = image
         self.vhd_containers = vhd_containers
         self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm.py
index 503bd3c007fd..ad86664f1328 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm.py
@@ -50,6 +50,12 @@ class VirtualMachineScaleSetVM(Resource):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine in the scale set. For instance: whether
+     the virtual machine has the capability to support attaching managed data
+     disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param os_profile: Specifies the operating system settings for the virtual
      machine.
     :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
@@ -97,6 +103,8 @@ class VirtualMachineScaleSetVM(Resource):
     :ivar resources: The virtual machine child extension resources.
     :vartype resources:
      list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    :ivar zones: The virtual machine zones.
+    :vartype zones: list[str]
     """
 
     _validation = {
@@ -111,6 +119,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_view': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'resources': {'readonly': True},
+        'zones': {'readonly': True},
     }
 
     _attribute_map = {
@@ -126,6 +135,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
         'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
@@ -134,6 +144,7 @@ class VirtualMachineScaleSetVM(Resource):
         'license_type': {'key': 'properties.licenseType', 'type': 'str'},
         'plan': {'key': 'plan', 'type': 'Plan'},
         'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'zones': {'key': 'zones', 'type': '[str]'},
     }
 
     def __init__(self, **kwargs):
@@ -145,6 +156,7 @@ def __init__(self, **kwargs):
         self.instance_view = None
         self.hardware_profile = kwargs.get('hardware_profile', None)
         self.storage_profile = kwargs.get('storage_profile', None)
+        self.additional_capabilities = kwargs.get('additional_capabilities', None)
         self.os_profile = kwargs.get('os_profile', None)
         self.network_profile = kwargs.get('network_profile', None)
         self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
@@ -153,3 +165,4 @@ def __init__(self, **kwargs):
         self.license_type = kwargs.get('license_type', None)
         self.plan = kwargs.get('plan', None)
         self.resources = None
+        self.zones = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile.py
index 409ccc950d55..7631eee97d95 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile.py
@@ -23,6 +23,12 @@ class VirtualMachineScaleSetVMProfile(Model):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetStorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine in the scale set. For instance: whether
+     the virtual machine has the capability to support attaching managed data
+     disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param network_profile: Specifies properties of the network interfaces of
      the virtual machines in the scale set.
     :type network_profile:
@@ -60,6 +66,7 @@ class VirtualMachineScaleSetVMProfile(Model):
     _attribute_map = {
         'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
         'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'additional_capabilities': {'key': 'additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
         'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
@@ -72,6 +79,7 @@ def __init__(self, **kwargs):
         super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
         self.os_profile = kwargs.get('os_profile', None)
         self.storage_profile = kwargs.get('storage_profile', None)
+        self.additional_capabilities = kwargs.get('additional_capabilities', None)
         self.network_profile = kwargs.get('network_profile', None)
         self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
         self.extension_profile = kwargs.get('extension_profile', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile_py3.py
index 778f52bc6f27..90608e71b679 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile_py3.py
@@ -23,6 +23,12 @@ class VirtualMachineScaleSetVMProfile(Model):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetStorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine in the scale set. For instance: whether
+     the virtual machine has the capability to support attaching managed data
+     disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param network_profile: Specifies properties of the network interfaces of
      the virtual machines in the scale set.
     :type network_profile:
@@ -60,6 +66,7 @@ class VirtualMachineScaleSetVMProfile(Model):
     _attribute_map = {
         'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
         'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'additional_capabilities': {'key': 'additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
         'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
@@ -68,10 +75,11 @@ class VirtualMachineScaleSetVMProfile(Model):
         'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'},
     }
 
-    def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, priority=None, eviction_policy=None, **kwargs) -> None:
+    def __init__(self, *, os_profile=None, storage_profile=None, additional_capabilities=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, priority=None, eviction_policy=None, **kwargs) -> None:
         super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
         self.os_profile = os_profile
         self.storage_profile = storage_profile
+        self.additional_capabilities = additional_capabilities
         self.network_profile = network_profile
         self.diagnostics_profile = diagnostics_profile
         self.extension_profile = extension_profile
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_py3.py
index c64077b1c210..9a560a94dae7 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_py3.py
@@ -50,6 +50,12 @@ class VirtualMachineScaleSetVM(Resource):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine in the scale set. For instance: whether
+     the virtual machine has the capability to support attaching managed data
+     disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param os_profile: Specifies the operating system settings for the virtual
      machine.
     :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
@@ -97,6 +103,8 @@ class VirtualMachineScaleSetVM(Resource):
     :ivar resources: The virtual machine child extension resources.
     :vartype resources:
      list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    :ivar zones: The virtual machine zones.
+    :vartype zones: list[str]
     """
 
     _validation = {
@@ -111,6 +119,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_view': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'resources': {'readonly': True},
+        'zones': {'readonly': True},
     }
 
     _attribute_map = {
@@ -126,6 +135,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
         'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
@@ -134,9 +144,10 @@ class VirtualMachineScaleSetVM(Resource):
         'license_type': {'key': 'properties.licenseType', 'type': 'str'},
         'plan': {'key': 'plan', 'type': 'Plan'},
         'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'zones': {'key': 'zones', 'type': '[str]'},
     }
 
-    def __init__(self, *, location: str, tags=None, hardware_profile=None, storage_profile=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, license_type: str=None, plan=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, license_type: str=None, plan=None, **kwargs) -> None:
         super(VirtualMachineScaleSetVM, self).__init__(location=location, tags=tags, **kwargs)
         self.instance_id = None
         self.sku = None
@@ -145,6 +156,7 @@ def __init__(self, *, location: str, tags=None, hardware_profile=None, storage_p
         self.instance_view = None
         self.hardware_profile = hardware_profile
         self.storage_profile = storage_profile
+        self.additional_capabilities = additional_capabilities
         self.os_profile = os_profile
         self.network_profile = network_profile
         self.diagnostics_profile = diagnostics_profile
@@ -153,3 +165,4 @@ def __init__(self, *, location: str, tags=None, hardware_profile=None, storage_p
         self.license_type = license_type
         self.plan = plan
         self.resources = None
+        self.zones = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update.py
index efd8774c7830..56fad5834158 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update.py
@@ -36,6 +36,12 @@ class VirtualMachineUpdate(UpdateResource):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine. For instance: whether the virtual
+     machine has the capability to support attaching managed data disks with
+     UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param os_profile: Specifies the operating system settings for the virtual
      machine.
     :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
@@ -97,6 +103,7 @@ class VirtualMachineUpdate(UpdateResource):
         'plan': {'key': 'plan', 'type': 'Plan'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
         'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
@@ -114,6 +121,7 @@ def __init__(self, **kwargs):
         self.plan = kwargs.get('plan', None)
         self.hardware_profile = kwargs.get('hardware_profile', None)
         self.storage_profile = kwargs.get('storage_profile', None)
+        self.additional_capabilities = kwargs.get('additional_capabilities', None)
         self.os_profile = kwargs.get('os_profile', None)
         self.network_profile = kwargs.get('network_profile', None)
         self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update_py3.py
index afb1194c2d53..59fe215d0b53 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update_py3.py
@@ -36,6 +36,12 @@ class VirtualMachineUpdate(UpdateResource):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the virtual machine. For instance: whether the virtual
+     machine has the capability to support attaching managed data disks with
+     UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
     :param os_profile: Specifies the operating system settings for the virtual
      machine.
     :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
@@ -97,6 +103,7 @@ class VirtualMachineUpdate(UpdateResource):
         'plan': {'key': 'plan', 'type': 'Plan'},
         'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
         'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
         'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
         'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
@@ -109,11 +116,12 @@ class VirtualMachineUpdate(UpdateResource):
         'zones': {'key': 'zones', 'type': '[str]'},
     }
 
-    def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profile=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None:
+    def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None:
         super(VirtualMachineUpdate, self).__init__(tags=tags, **kwargs)
         self.plan = plan
         self.hardware_profile = hardware_profile
         self.storage_profile = storage_profile
+        self.additional_capabilities = additional_capabilities
         self.os_profile = os_profile
         self.network_profile = network_profile
         self.diagnostics_profile = diagnostics_profile
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/__init__.py
index 7f77ecf69132..662b518ecea8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/__init__.py
@@ -27,6 +27,8 @@
 from .galleries_operations import GalleriesOperations
 from .gallery_images_operations import GalleryImagesOperations
 from .gallery_image_versions_operations import GalleryImageVersionsOperations
+from .disks_operations import DisksOperations
+from .snapshots_operations import SnapshotsOperations
 
 __all__ = [
     'Operations',
@@ -47,4 +49,6 @@
     'GalleriesOperations',
     'GalleryImagesOperations',
     'GalleryImageVersionsOperations',
+    'DisksOperations',
+    'SnapshotsOperations',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/disks_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/disks_operations.py
new file mode 100644
index 000000000000..52ad5ce53bc0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/disks_operations.py
@@ -0,0 +1,722 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+import uuid
+from msrest.pipeline import ClientRawResponse
+from msrestazure.azure_exceptions import CloudError
+from msrest.polling import LROPoller, NoPolling
+from msrestazure.polling.arm_polling import ARMPolling
+
+from .. import models
+
+
+class DisksOperations(object):
+    """DisksOperations operations.
+
+    :param client: Client for service requests.
+    :param config: Configuration of service client.
+    :param serializer: An object model serializer.
+    :param deserializer: An object model deserializer.
+    :ivar api_version: Client Api Version. Constant value: "2018-06-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-06-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, disk_name, disk, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'diskName': self._serialize.url("disk_name", disk_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct body
+        body_content = self._serialize.body(disk, 'Disk')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('Disk', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('Disk', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, disk_name, disk, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Creates or updates a disk.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param disk_name: The name of the managed disk that is being created.
+         The name can't be changed after the disk is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The maximum name
+         length is 80 characters.
+        :type disk_name: str
+        :param disk: Disk object supplied in the body of the Put disk
+         operation.
+        :type disk: ~azure.mgmt.compute.v2018_06_01.models.Disk
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns Disk or
+         ClientRawResponse<Disk> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.Disk]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.Disk]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            disk_name=disk_name,
+            disk=disk,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Disk', response)
+
+            if raw:
+                client_raw_response = ClientRawResponse(deserialized, response)
+                return client_raw_response
+
+            return deserialized
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, disk_name, disk, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'diskName': self._serialize.url("disk_name", disk_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct body
+        body_content = self._serialize.body(disk, 'DiskUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('Disk', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('Disk', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, disk_name, disk, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Updates (patches) a disk.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param disk_name: The name of the managed disk that is being created.
+         The name can't be changed after the disk is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The maximum name
+         length is 80 characters.
+        :type disk_name: str
+        :param disk: Disk object supplied in the body of the Patch disk
+         operation.
+        :type disk: ~azure.mgmt.compute.v2018_06_01.models.DiskUpdate
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns Disk or
+         ClientRawResponse<Disk> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.Disk]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.Disk]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            disk_name=disk_name,
+            disk=disk,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Disk', response)
+
+            if raw:
+                client_raw_response = ClientRawResponse(deserialized, response)
+                return client_raw_response
+
+            return deserialized
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}'}
+
+    def get(
+            self, resource_group_name, disk_name, custom_headers=None, raw=False, **operation_config):
+        """Gets information about a disk.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param disk_name: The name of the managed disk that is being created.
+         The name can't be changed after the disk is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The maximum name
+         length is 80 characters.
+        :type disk_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: Disk or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.Disk or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'diskName': self._serialize.url("disk_name", disk_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('Disk', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, disk_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'diskName': self._serialize.url("disk_name", disk_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202, 204]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+
+    def delete(
+            self, resource_group_name, disk_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a disk.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param disk_name: The name of the managed disk that is being created.
+         The name can't be changed after the disk is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The maximum name
+         length is 80 characters.
+        :type disk_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns None or
+         ClientRawResponse<None> if raw==True
+        :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._delete_initial(
+            resource_group_name=resource_group_name,
+            disk_name=disk_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            if raw:
+                client_raw_response = ClientRawResponse(None, response)
+                return client_raw_response
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}'}
+
+    def list_by_resource_group(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all the disks under a resource group.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of Disk
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.DiskPaged[~azure.mgmt.compute.v2018_06_01.models.Disk]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_by_resource_group.metadata['url']
+                path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str')
+                }
+                url = self._client.format_url(url, **path_format_arguments)
+
+                # Construct parameters
+                query_parameters = {}
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
+            if self.config.generate_client_request_id:
+                header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+            if custom_headers:
+                header_parameters.update(custom_headers)
+            if self.config.accept_language is not None:
+                header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+            # Construct and send request
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
+
+            if response.status_code not in [200]:
+                exp = CloudError(response)
+                exp.request_id = response.headers.get('x-ms-request-id')
+                raise exp
+
+            return response
+
+        # Deserialize response
+        deserialized = models.DiskPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.DiskPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks'}
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all the disks under a subscription.
+
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of Disk
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.DiskPaged[~azure.mgmt.compute.v2018_06_01.models.Disk]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list.metadata['url']
+                path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+                }
+                url = self._client.format_url(url, **path_format_arguments)
+
+                # Construct parameters
+                query_parameters = {}
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
+            if self.config.generate_client_request_id:
+                header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+            if custom_headers:
+                header_parameters.update(custom_headers)
+            if self.config.accept_language is not None:
+                header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+            # Construct and send request
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
+
+            if response.status_code not in [200]:
+                exp = CloudError(response)
+                exp.request_id = response.headers.get('x-ms-request-id')
+                raise exp
+
+            return response
+
+        # Deserialize response
+        deserialized = models.DiskPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.DiskPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks'}
+
+
+    def _grant_access_initial(
+            self, resource_group_name, disk_name, access, duration_in_seconds, custom_headers=None, raw=False, **operation_config):
+        grant_access_data = models.GrantAccessData(access=access, duration_in_seconds=duration_in_seconds)
+
+        # Construct URL
+        url = self.grant_access.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'diskName': self._serialize.url("disk_name", disk_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct body
+        body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('AccessUri', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def grant_access(
+            self, resource_group_name, disk_name, access, duration_in_seconds, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Grants access to a disk.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param disk_name: The name of the managed disk that is being created.
+         The name can't be changed after the disk is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The maximum name
+         length is 80 characters.
+        :type disk_name: str
+        :param access: Possible values include: 'None', 'Read'
+        :type access: str or
+         ~azure.mgmt.compute.v2018_06_01.models.AccessLevel
+        :param duration_in_seconds: Time duration in seconds until the SAS
+         access expires.
+        :type duration_in_seconds: int
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns AccessUri or
+         ClientRawResponse<AccessUri> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.AccessUri]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.AccessUri]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._grant_access_initial(
+            resource_group_name=resource_group_name,
+            disk_name=disk_name,
+            access=access,
+            duration_in_seconds=duration_in_seconds,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('AccessUri', response)
+
+            if raw:
+                client_raw_response = ClientRawResponse(deserialized, response)
+                return client_raw_response
+
+            return deserialized
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    grant_access.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/beginGetAccess'}
+
+
+    def _revoke_access_initial(
+            self, resource_group_name, disk_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.revoke_access.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'diskName': self._serialize.url("disk_name", disk_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+
+    def revoke_access(
+            self, resource_group_name, disk_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Revokes access to a disk.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param disk_name: The name of the managed disk that is being created.
+         The name can't be changed after the disk is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The maximum name
+         length is 80 characters.
+        :type disk_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns None or
+         ClientRawResponse<None> if raw==True
+        :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._revoke_access_initial(
+            resource_group_name=resource_group_name,
+            disk_name=disk_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            if raw:
+                client_raw_response = ClientRawResponse(None, response)
+                return client_raw_response
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    revoke_access.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/endGetAccess'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/snapshots_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/snapshots_operations.py
new file mode 100644
index 000000000000..a54975126140
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/snapshots_operations.py
@@ -0,0 +1,722 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+import uuid
+from msrest.pipeline import ClientRawResponse
+from msrestazure.azure_exceptions import CloudError
+from msrest.polling import LROPoller, NoPolling
+from msrestazure.polling.arm_polling import ARMPolling
+
+from .. import models
+
+
+class SnapshotsOperations(object):
+    """SnapshotsOperations operations.
+
+    :param client: Client for service requests.
+    :param config: Configuration of service client.
+    :param serializer: An object model serializer.
+    :param deserializer: An object model deserializer.
+    :ivar api_version: Client Api Version. Constant value: "2018-06-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-06-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, snapshot_name, snapshot, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'snapshotName': self._serialize.url("snapshot_name", snapshot_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct body
+        body_content = self._serialize.body(snapshot, 'Snapshot')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('Snapshot', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('Snapshot', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, snapshot_name, snapshot, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Creates or updates a snapshot.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param snapshot_name: The name of the snapshot that is being created.
+         The name can't be changed after the snapshot is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The max name length
+         is 80 characters.
+        :type snapshot_name: str
+        :param snapshot: Snapshot object supplied in the body of the Put disk
+         operation.
+        :type snapshot: ~azure.mgmt.compute.v2018_06_01.models.Snapshot
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns Snapshot or
+         ClientRawResponse<Snapshot> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.Snapshot]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.Snapshot]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            snapshot_name=snapshot_name,
+            snapshot=snapshot,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Snapshot', response)
+
+            if raw:
+                client_raw_response = ClientRawResponse(deserialized, response)
+                return client_raw_response
+
+            return deserialized
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, snapshot_name, snapshot, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'snapshotName': self._serialize.url("snapshot_name", snapshot_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct body
+        body_content = self._serialize.body(snapshot, 'SnapshotUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('Snapshot', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('Snapshot', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, snapshot_name, snapshot, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Updates (patches) a snapshot.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param snapshot_name: The name of the snapshot that is being created.
+         The name can't be changed after the snapshot is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The max name length
+         is 80 characters.
+        :type snapshot_name: str
+        :param snapshot: Snapshot object supplied in the body of the Patch
+         snapshot operation.
+        :type snapshot: ~azure.mgmt.compute.v2018_06_01.models.SnapshotUpdate
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns Snapshot or
+         ClientRawResponse<Snapshot> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.Snapshot]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.Snapshot]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            snapshot_name=snapshot_name,
+            snapshot=snapshot,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Snapshot', response)
+
+            if raw:
+                client_raw_response = ClientRawResponse(deserialized, response)
+                return client_raw_response
+
+            return deserialized
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}'}
+
+    def get(
+            self, resource_group_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
+        """Gets information about a snapshot.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param snapshot_name: The name of the snapshot that is being created.
+         The name can't be changed after the snapshot is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The max name length
+         is 80 characters.
+        :type snapshot_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: Snapshot or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.Snapshot or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'snapshotName': self._serialize.url("snapshot_name", snapshot_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('Snapshot', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'snapshotName': self._serialize.url("snapshot_name", snapshot_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202, 204]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+
+    def delete(
+            self, resource_group_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a snapshot.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param snapshot_name: The name of the snapshot that is being created.
+         The name can't be changed after the snapshot is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The max name length
+         is 80 characters.
+        :type snapshot_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns None or
+         ClientRawResponse<None> if raw==True
+        :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._delete_initial(
+            resource_group_name=resource_group_name,
+            snapshot_name=snapshot_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            if raw:
+                client_raw_response = ClientRawResponse(None, response)
+                return client_raw_response
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}'}
+
+    def list_by_resource_group(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists snapshots under a resource group.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of Snapshot
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.SnapshotPaged[~azure.mgmt.compute.v2018_06_01.models.Snapshot]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_by_resource_group.metadata['url']
+                path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str')
+                }
+                url = self._client.format_url(url, **path_format_arguments)
+
+                # Construct parameters
+                query_parameters = {}
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
+            if self.config.generate_client_request_id:
+                header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+            if custom_headers:
+                header_parameters.update(custom_headers)
+            if self.config.accept_language is not None:
+                header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+            # Construct and send request
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
+
+            if response.status_code not in [200]:
+                exp = CloudError(response)
+                exp.request_id = response.headers.get('x-ms-request-id')
+                raise exp
+
+            return response
+
+        # Deserialize response
+        deserialized = models.SnapshotPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.SnapshotPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots'}
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists snapshots under a subscription.
+
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of Snapshot
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.SnapshotPaged[~azure.mgmt.compute.v2018_06_01.models.Snapshot]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list.metadata['url']
+                path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+                }
+                url = self._client.format_url(url, **path_format_arguments)
+
+                # Construct parameters
+                query_parameters = {}
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
+            if self.config.generate_client_request_id:
+                header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+            if custom_headers:
+                header_parameters.update(custom_headers)
+            if self.config.accept_language is not None:
+                header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+            # Construct and send request
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
+
+            if response.status_code not in [200]:
+                exp = CloudError(response)
+                exp.request_id = response.headers.get('x-ms-request-id')
+                raise exp
+
+            return response
+
+        # Deserialize response
+        deserialized = models.SnapshotPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.SnapshotPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/snapshots'}
+
+
+    def _grant_access_initial(
+            self, resource_group_name, snapshot_name, access, duration_in_seconds, custom_headers=None, raw=False, **operation_config):
+        grant_access_data = models.GrantAccessData(access=access, duration_in_seconds=duration_in_seconds)
+
+        # Construct URL
+        url = self.grant_access.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'snapshotName': self._serialize.url("snapshot_name", snapshot_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct body
+        body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('AccessUri', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def grant_access(
+            self, resource_group_name, snapshot_name, access, duration_in_seconds, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Grants access to a snapshot.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param snapshot_name: The name of the snapshot that is being created.
+         The name can't be changed after the snapshot is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The max name length
+         is 80 characters.
+        :type snapshot_name: str
+        :param access: Possible values include: 'None', 'Read'
+        :type access: str or
+         ~azure.mgmt.compute.v2018_06_01.models.AccessLevel
+        :param duration_in_seconds: Time duration in seconds until the SAS
+         access expires.
+        :type duration_in_seconds: int
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns AccessUri or
+         ClientRawResponse<AccessUri> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.AccessUri]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.AccessUri]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._grant_access_initial(
+            resource_group_name=resource_group_name,
+            snapshot_name=snapshot_name,
+            access=access,
+            duration_in_seconds=duration_in_seconds,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('AccessUri', response)
+
+            if raw:
+                client_raw_response = ClientRawResponse(deserialized, response)
+                return client_raw_response
+
+            return deserialized
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    grant_access.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/beginGetAccess'}
+
+
+    def _revoke_access_initial(
+            self, resource_group_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.revoke_access.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'snapshotName': self._serialize.url("snapshot_name", snapshot_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+
+    def revoke_access(
+            self, resource_group_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Revokes access to a snapshot.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param snapshot_name: The name of the snapshot that is being created.
+         The name can't be changed after the snapshot is created. Supported
+         characters for the name are a-z, A-Z, 0-9 and _. The max name length
+         is 80 characters.
+        :type snapshot_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns None or
+         ClientRawResponse<None> if raw==True
+        :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._revoke_access_initial(
+            resource_group_name=resource_group_name,
+            snapshot_name=snapshot_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            if raw:
+                client_raw_response = ClientRawResponse(None, response)
+                return client_raw_response
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    revoke_access.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/endGetAccess'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
index 0fb3a482349b..0127fe1c5c4a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
@@ -200,6 +200,88 @@ def get_long_running_output(response):
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     start_os_upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osRollingUpgrade'}
 
+
+    def _start_extension_upgrade_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start_extension_upgrade.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmScaleSetName': self._serialize.url("vm_scale_set_name", vm_scale_set_name, 'str'),
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200, 202]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+
+    def start_extension_upgrade(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Starts a rolling upgrade to move all extensions for all virtual machine
+        scale set instances to the latest available extension version.
+        Instances which are already running the latest extension versions are
+        not affected.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_scale_set_name: The name of the VM scale set.
+        :type vm_scale_set_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns None or
+         ClientRawResponse<None> if raw==True
+        :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._start_extension_upgrade_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            if raw:
+                client_raw_response = ClientRawResponse(None, response)
+                return client_raw_response
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    start_extension_upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/extensionRollingUpgrade'}
+
     def get_latest(
             self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
         """Gets the status of the latest virtual machine scale set rolling
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_sets_operations.py
index ee4c53596d64..7fa76a536bac 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_sets_operations.py
@@ -1352,6 +1352,9 @@ def _perform_maintenance_initial(
     def perform_maintenance(
             self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
         """Perform maintenance on one or more virtual machines in a VM scale set.
+        Operation on instances which are not eligible for perform maintenance
+        will be failed. Please refer to best practices for more details:
+        https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
 
         :param resource_group_name: The name of the resource group.
         :type resource_group_name: str
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_sizes_operations.py
index a9f96e9c4f70..799ade49c144 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_sizes_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_sizes_operations.py
@@ -39,8 +39,8 @@ def __init__(self, client, config, serializer, deserializer):
 
     def list(
             self, location, custom_headers=None, raw=False, **operation_config):
-        """Lists all available virtual machine sizes for a subscription in a
-        location.
+        """This API is deprecated. Use [Resources
+        Skus](https://docs.microsoft.com/en-us/rest/api/compute/resourceskus/list).
 
         :param location: The location upon which virtual-machine-sizes is
          queried.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/version.py b/azure-mgmt-compute/azure/mgmt/compute/version.py
index ffdd8a201ce0..4701d51e606d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/version.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/version.py
@@ -5,4 +5,4 @@
 # license information.
 # --------------------------------------------------------------------------
 
-VERSION = "4.0.1"
+VERSION = "4.1.0"
diff --git a/azure-mgmt-compute/setup.py b/azure-mgmt-compute/setup.py
index 496fd34c6324..090ca2ca4a52 100644
--- a/azure-mgmt-compute/setup.py
+++ b/azure-mgmt-compute/setup.py
@@ -72,14 +72,15 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
     packages=find_packages(exclude=["tests"]),
     install_requires=[
         'msrest>=0.5.0',
-        'msrestazure>=0.4.27,<2.0.0',
-        'azure-common~=1.1,>=1.1.9',
+        'msrestazure>=0.4.32,<2.0.0',
+        'azure-common~=1.1',
     ],
     cmdclass=cmdclass
 )
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_change_account_type.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_change_account_type.yaml
index 6cf70600eed0..fb10e0d320ea 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_change_account_type.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_change_account_type.yaml
@@ -8,24 +8,24 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['99']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"provisioningState\"\
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"myDisk\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/55d2dbb5-98b1-492c-a444-10d921fb6266?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/6b1e1671-70ce-43e8-9a32-10d236d493f9?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['224']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:20:20 GMT']
+      date: ['Mon, 10 Sep 2018 23:11:01 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/55d2dbb5-98b1-492c-a444-10d921fb6266?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/6b1e1671-70ce-43e8-9a32-10d236d493f9?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
@@ -39,25 +39,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/55d2dbb5-98b1-492c-a444-10d921fb6266?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/6b1e1671-70ce-43e8-9a32-10d236d493f9?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:20:20.8967553+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:20:21.0529939+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:11:02.0564197+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:11:02.2598918+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:20:20.8967553+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:11:02.0720484+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk\"\
-        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"55d2dbb5-98b1-492c-a444-10d921fb6266\"\
+        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"6b1e1671-70ce-43e8-9a32-10d236d493f9\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['693']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:20:51 GMT']
+      date: ['Mon, 10 Sep 2018 23:11:31 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -73,15 +73,15 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:20:20.8967553+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:11:02.0720484+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk\"\
@@ -90,7 +90,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['572']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:20:51 GMT']
+      date: ['Mon, 10 Sep 2018 23:11:32 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -98,7 +98,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4998,Microsoft.Compute/LowCostGet30Min;19998']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4997,Microsoft.Compute/LowCostGet30Min;19997']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -106,17 +106,16 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:20:20.8967553+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:11:02.0720484+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk\"\
@@ -125,7 +124,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['572']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:20:51 GMT']
+      date: ['Mon, 10 Sep 2018 23:11:33 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -133,7 +132,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4997,Microsoft.Compute/LowCostGet30Min;19997']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4996,Microsoft.Compute/LowCostGet30Min;19996']
     status: {code: 200, message: OK}
 - request:
     body: '{"location": "westus", "sku": {"name": "Standard_LRS"}, "properties": {"creationData":
@@ -144,11 +143,11 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['132']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\"\r\n  },\r\n\
         \  \"properties\": {\r\n    \"creationData\": {\r\n      \"createOption\"\
@@ -156,13 +155,13 @@ interactions:
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"myDisk\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/9bdec6fc-4a76-4492-9227-84ddde7f64a2?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/cc87b6a9-f2d8-4da5-8d66-5b63356806d8?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['270']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:20:52 GMT']
+      date: ['Mon, 10 Sep 2018 23:11:33 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/9bdec6fc-4a76-4492-9227-84ddde7f64a2?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/cc87b6a9-f2d8-4da5-8d66-5b63356806d8?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
@@ -176,25 +175,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/9bdec6fc-4a76-4492-9227-84ddde7f64a2?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/cc87b6a9-f2d8-4da5-8d66-5b63356806d8?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:20:53.723007+00:00\",\r\n\
-        \  \"endTime\": \"2018-03-21T21:20:53.8948486+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:11:34.5443248+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:11:34.7005866+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:20:20.8967553+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:11:02.0720484+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk\"\
-        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"9bdec6fc-4a76-4492-9227-84ddde7f64a2\"\
+        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"cc87b6a9-f2d8-4da5-8d66-5b63356806d8\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['692']
+      content-length: ['693']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:21:24 GMT']
+      date: ['Mon, 10 Sep 2018 23:12:04 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -210,15 +209,15 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:20:20.8967553+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:11:02.0720484+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_change_account_typedfe7139e/providers/Microsoft.Compute/disks/myDisk\"\
@@ -227,7 +226,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['572']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:21:25 GMT']
+      date: ['Mon, 10 Sep 2018 23:12:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -235,6 +234,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4995,Microsoft.Compute/LowCostGet30Min;19995']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4993,Microsoft.Compute/LowCostGet30Min;19993']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_snapshot.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_snapshot.yaml
index 384688282841..637ad41a039d 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_snapshot.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_snapshot.yaml
@@ -8,30 +8,30 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['99']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"provisioningState\"\
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"myDisk\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a54172a2-e9c3-4968-98ce-7e557d23e31f?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/8062ed06-4a60-4d02-8029-255bcc796b73?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['224']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:21:48 GMT']
+      date: ['Mon, 10 Sep 2018 23:12:24 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a54172a2-e9c3-4968-98ce-7e557d23e31f?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/8062ed06-4a60-4d02-8029-255bcc796b73?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
       x-content-type-options: [nosniff]
       x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;997,Microsoft.Compute/CreateUpdateDisks30Min;3997']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -39,25 +39,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a54172a2-e9c3-4968-98ce-7e557d23e31f?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/8062ed06-4a60-4d02-8029-255bcc796b73?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:21:48.5691741+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:21:48.7441701+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:12:24.5515493+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:12:24.7546854+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:21:48.584802+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:12:24.5515493+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk\"\
-        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"a54172a2-e9c3-4968-98ce-7e557d23e31f\"\
+        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"8062ed06-4a60-4d02-8029-255bcc796b73\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['688']
+      content-length: ['689']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:22:18 GMT']
+      date: ['Mon, 10 Sep 2018 23:12:54 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -73,24 +73,24 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:21:48.584802+00:00\",\r\n  \
-        \  \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:12:24.5515493+00:00\",\r\n \
+        \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk\"\
         ,\r\n  \"name\": \"myDisk\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['567']
+      content-length: ['568']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:22:20 GMT']
+      date: ['Mon, 10 Sep 2018 23:12:55 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -98,7 +98,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4993,Microsoft.Compute/LowCostGet30Min;19993']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4990,Microsoft.Compute/LowCostGet30Min;19990']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -106,26 +106,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:21:48.584802+00:00\",\r\n  \
-        \  \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:12:24.5515493+00:00\",\r\n \
+        \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk\"\
         ,\r\n  \"name\": \"myDisk\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['567']
+      content-length: ['568']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:22:19 GMT']
+      date: ['Mon, 10 Sep 2018 23:12:55 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -133,35 +132,35 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4992,Microsoft.Compute/LowCostGet30Min;19992']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4989,Microsoft.Compute/LowCostGet30Min;19989']
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"creationData": {"createOption":
-      "Copy", "sourceUri": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk"}}}\\\''\'''''
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"creationData":
+      {"createOption": "Copy", "sourceUri": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk"}}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['257']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/snapshots/mySnapshot?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/snapshots/mySnapshot?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Copy\",\r\n      \"sourceUri\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk\"\
         \r\n    },\r\n    \"provisioningState\": \"Updating\",\r\n    \"isArmResource\"\
         : true\r\n  },\r\n  \"location\": \"westus\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/cf2c9798-a0a8-4c4c-9156-52cb76f4514d?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a598a802-1410-4685-a2bb-abfc8f93d0c7?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['363']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:22:21 GMT']
+      date: ['Mon, 10 Sep 2018 23:12:56 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/cf2c9798-a0a8-4c4c-9156-52cb76f4514d?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a598a802-1410-4685-a2bb-abfc8f93d0c7?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
@@ -175,26 +174,26 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/cf2c9798-a0a8-4c4c-9156-52cb76f4514d?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/a598a802-1410-4685-a2bb-abfc8f93d0c7?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:22:21.7211275+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:22:32.6168462+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:12:57.1433752+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:12:58.3935693+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
         :{\"createOption\":\"Copy\",\"sourceResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk\"\
-        },\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:22:21.7523604+00:00\"\
+        },\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:12:57.1590056+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/snapshots\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/snapshots/mySnapshot\"\
-        ,\"name\":\"mySnapshot\"}\r\n  },\r\n  \"name\": \"cf2c9798-a0a8-4c4c-9156-52cb76f4514d\"\
+        ,\"name\":\"mySnapshot\"}\r\n  },\r\n  \"name\": \"a598a802-1410-4685-a2bb-abfc8f93d0c7\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['886']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:22:51 GMT']
+      date: ['Mon, 10 Sep 2018 23:13:26 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -210,16 +209,16 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/snapshots/mySnapshot?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/snapshots/mySnapshot?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Copy\",\r\n      \"sourceResourceId\": \"\
         /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/disks/myDisk\"\
-        \r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"timeCreated\": \"2018-03-21T21:22:21.7523604+00:00\"\
+        \r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"timeCreated\": \"2018-09-10T23:12:57.1590056+00:00\"\
         ,\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/snapshots\",\r\n  \"location\"\
         : \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_snapshot9571120e/providers/Microsoft.Compute/snapshots/mySnapshot\"\
@@ -228,7 +227,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['774']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:22:52 GMT']
+      date: ['Mon, 10 Sep 2018 23:13:27 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -236,6 +235,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4990,Microsoft.Compute/LowCostGet30Min;19990']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4986,Microsoft.Compute/LowCostGet30Min;19986']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_virtual_machine_scale_set.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_virtual_machine_scale_set.yaml
index ddbbaba273a0..94898bf8c398 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_virtual_machine_scale_set.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_virtual_machine_scale_set.yaml
@@ -2,38 +2,40 @@ interactions:
 - request:
     body: '{"location": "westus", "properties": {"addressSpace": {"addressPrefixes":
       ["10.0.0.0/16"]}, "subnets": [{"properties": {"addressPrefix": "10.0.0.0/24"},
-      "name": "pyvmirsub5cc18eb"}]}}'
+      "name": "pyvmirsub5cc18eb"}], "enableDdosProtection": false, "enableVmProtection":
+      false}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['183']
+      Content-Length: ['243']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet5cc18eb\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb\"\
-        ,\r\n  \"etag\": \"W/\\\"7c227f05-36cc-41b9-9c1e-24abcdcd74fc\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8fe5ebbd-391f-4397-8692-30c6bd7fc53a\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"5bb4a7a8-2bff-4f31-ba6c-71451e40cdc3\",\r\n    \"\
+        \   \"resourceGuid\": \"2b530850-585f-49ee-8cf2-eed32ddb55bd\",\r\n    \"\
         addressSpace\": {\r\n      \"addressPrefixes\": [\r\n        \"10.0.0.0/16\"\
         \r\n      ]\r\n    },\r\n    \"subnets\": [\r\n      {\r\n        \"name\"\
         : \"pyvmirsub5cc18eb\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb/subnets/pyvmirsub5cc18eb\"\
-        ,\r\n        \"etag\": \"W/\\\"7c227f05-36cc-41b9-9c1e-24abcdcd74fc\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"8fe5ebbd-391f-4397-8692-30c6bd7fc53a\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Updating\"\
-        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\"\r\n        }\r\n      }\r\
-        \n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
+        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\",\r\n          \"delegations\"\
+        : []\r\n        },\r\n        \"type\": \"Microsoft.Network/virtualNetworks/subnets\"\
+        \r\n      }\r\n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
         : false,\r\n    \"enableVmProtection\": false\r\n  }\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/db27f74a-74ad-44e1-91fe-e0fba2259a78?api-version=2018-02-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/7d5f9446-02ff-43e0-a102-347695790cb6?api-version=2018-07-01']
       cache-control: [no-cache]
-      content-length: ['1198']
+      content-length: ['1290']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:37:05 GMT']
+      date: ['Mon, 10 Sep 2018 23:13:35 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -47,17 +49,17 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/db27f74a-74ad-44e1-91fe-e0fba2259a78?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/7d5f9446-02ff-43e0-a102-347695790cb6?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"status\": \"InProgress\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['30']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:37:09 GMT']
+      date: ['Mon, 10 Sep 2018 23:13:38 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -72,17 +74,17 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/db27f74a-74ad-44e1-91fe-e0fba2259a78?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/7d5f9446-02ff-43e0-a102-347695790cb6?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"status\": \"Succeeded\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['29']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:37:20 GMT']
+      date: ['Mon, 10 Sep 2018 23:13:49 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -97,30 +99,31 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet5cc18eb\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb\"\
-        ,\r\n  \"etag\": \"W/\\\"b9f1d43d-22e4-43c8-8317-850fa2f0b96e\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"ac8ccd9b-2b35-45d5-bced-310cd83fc94c\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"5bb4a7a8-2bff-4f31-ba6c-71451e40cdc3\",\r\n    \"\
+        \    \"resourceGuid\": \"2b530850-585f-49ee-8cf2-eed32ddb55bd\",\r\n    \"\
         addressSpace\": {\r\n      \"addressPrefixes\": [\r\n        \"10.0.0.0/16\"\
         \r\n      ]\r\n    },\r\n    \"subnets\": [\r\n      {\r\n        \"name\"\
         : \"pyvmirsub5cc18eb\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb/subnets/pyvmirsub5cc18eb\"\
-        ,\r\n        \"etag\": \"W/\\\"b9f1d43d-22e4-43c8-8317-850fa2f0b96e\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"ac8ccd9b-2b35-45d5-bced-310cd83fc94c\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
-        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\"\r\n        }\r\n      }\r\
-        \n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
+        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\",\r\n          \"delegations\"\
+        : []\r\n        },\r\n        \"type\": \"Microsoft.Network/virtualNetworks/subnets\"\
+        \r\n      }\r\n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
         : false,\r\n    \"enableVmProtection\": false\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1200']
+      content-length: ['1292']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:37:20 GMT']
-      etag: [W/"b9f1d43d-22e4-43c8-8317-850fa2f0b96e"]
+      date: ['Mon, 10 Sep 2018 23:13:50 GMT']
+      etag: [W/"ac8ccd9b-2b35-45d5-bced-310cd83fc94c"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -135,23 +138,23 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb/subnets/pyvmirsub5cc18eb?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb/subnets/pyvmirsub5cc18eb?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirsub5cc18eb\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb/subnets/pyvmirsub5cc18eb\"\
-        ,\r\n  \"etag\": \"W/\\\"b9f1d43d-22e4-43c8-8317-850fa2f0b96e\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"ac8ccd9b-2b35-45d5-bced-310cd83fc94c\\\"\",\r\n \
         \ \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
-        addressPrefix\": \"10.0.0.0/24\"\r\n  }\r\n}"}
+        addressPrefix\": \"10.0.0.0/24\",\r\n    \"delegations\": []\r\n  },\r\n \
+        \ \"type\": \"Microsoft.Network/virtualNetworks/subnets\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['425']
+      content-length: ['505']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:37:22 GMT']
-      etag: [W/"b9f1d43d-22e4-43c8-8317-850fa2f0b96e"]
+      date: ['Mon, 10 Sep 2018 23:13:51 GMT']
+      etag: [W/"ac8ccd9b-2b35-45d5-bced-310cd83fc94c"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -176,8 +179,8 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['867']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Compute/virtualMachineScaleSets/pyvmirvm5cc18eb?api-version=2018-06-01
@@ -203,23 +206,23 @@ interactions:
         ipConfigurations\":[{\"name\":\"PyTestInfixipconfig\",\"properties\":{\"subnet\"\
         :{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb/subnets/pyvmirsub5cc18eb\"\
         },\"privateIPAddressVersion\":\"IPv4\"}}]}}]}\r\n    },\r\n    \"provisioningState\"\
-        : \"Creating\",\r\n    \"overprovision\": true,\r\n    \"uniqueId\": \"1bfeb98c-4800-46ed-a794-0ede0003daf9\"\
+        : \"Creating\",\r\n    \"overprovision\": true,\r\n    \"uniqueId\": \"f3f29f96-7631-46d4-a7b3-f266da8455c1\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachineScaleSets\",\r\n\
         \  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Compute/virtualMachineScaleSets/pyvmirvm5cc18eb\"\
         ,\r\n  \"name\": \"pyvmirvm5cc18eb\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/87aab33f-2ddd-434c-a646-098d5e9b4995?api-version=2018-06-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/656c3faf-3e2b-451d-80ac-2d2bfacc4c25?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['2006']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:37:24 GMT']
+      date: ['Mon, 10 Sep 2018 23:13:52 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
       x-content-type-options: [nosniff]
       x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateVMScaleSet3Min;39,Microsoft.Compute/CreateVMScaleSet30Min;199,Microsoft.Compute/VMScaleSetBatchedVMRequests5Min;1193,Microsoft.Compute/VmssQueuedVMOperations;4793']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
       x-ms-request-charge: ['7']
     status: {code: 201, message: Created}
 - request:
@@ -228,75 +231,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/87aab33f-2ddd-434c-a646-098d5e9b4995?api-version=2018-06-01
-  response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:37:23.9335637+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"87aab33f-2ddd-434c-a646-098d5e9b4995\"\
-        \r\n}"}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['134']
-      content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:37:41 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      transfer-encoding: [chunked]
-      vary: [Accept-Encoding]
-      x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14994,Microsoft.Compute/GetOperation30Min;29982']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/87aab33f-2ddd-434c-a646-098d5e9b4995?api-version=2018-06-01
-  response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:37:23.9335637+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"87aab33f-2ddd-434c-a646-098d5e9b4995\"\
-        \r\n}"}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['134']
-      content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:38:11 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      transfer-encoding: [chunked]
-      vary: [Accept-Encoding]
-      x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14994,Microsoft.Compute/GetOperation30Min;29980']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/87aab33f-2ddd-434c-a646-098d5e9b4995?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/656c3faf-3e2b-451d-80ac-2d2bfacc4c25?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:37:23.9335637+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"87aab33f-2ddd-434c-a646-098d5e9b4995\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:13:52.4768635+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"656c3faf-3e2b-451d-80ac-2d2bfacc4c25\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:38:42 GMT']
+      date: ['Mon, 10 Sep 2018 23:14:02 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -304,7 +251,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14991,Microsoft.Compute/GetOperation30Min;29977']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14999,Microsoft.Compute/GetOperation30Min;29999']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -312,19 +259,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/87aab33f-2ddd-434c-a646-098d5e9b4995?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/656c3faf-3e2b-451d-80ac-2d2bfacc4c25?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:37:23.9335637+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"87aab33f-2ddd-434c-a646-098d5e9b4995\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:13:52.4768635+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"656c3faf-3e2b-451d-80ac-2d2bfacc4c25\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:39:15 GMT']
+      date: ['Mon, 10 Sep 2018 23:15:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -332,7 +279,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14989,Microsoft.Compute/GetOperation30Min;29974']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14994,Microsoft.Compute/GetOperation30Min;29994']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -340,19 +287,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/87aab33f-2ddd-434c-a646-098d5e9b4995?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/656c3faf-3e2b-451d-80ac-2d2bfacc4c25?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:37:23.9335637+00:00\",\r\
-        \n  \"endTime\": \"2018-07-20T19:39:18.955664+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"87aab33f-2ddd-434c-a646-098d5e9b4995\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:13:52.4768635+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:15:25.7915433+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"656c3faf-3e2b-451d-80ac-2d2bfacc4c25\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['183']
+      content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:39:46 GMT']
+      date: ['Mon, 10 Sep 2018 23:15:36 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -360,7 +307,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29972']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14991,Microsoft.Compute/GetOperation30Min;29991']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -368,8 +315,8 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Compute/virtualMachineScaleSets/pyvmirvm5cc18eb?api-version=2018-06-01
   response:
@@ -394,7 +341,7 @@ interactions:
         ipConfigurations\":[{\"name\":\"PyTestInfixipconfig\",\"properties\":{\"subnet\"\
         :{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Network/virtualNetworks/pyvmirnet5cc18eb/subnets/pyvmirsub5cc18eb\"\
         },\"privateIPAddressVersion\":\"IPv4\"}}]}}]}\r\n    },\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"overprovision\": true,\r\n    \"uniqueId\": \"1bfeb98c-4800-46ed-a794-0ede0003daf9\"\
+        : \"Succeeded\",\r\n    \"overprovision\": true,\r\n    \"uniqueId\": \"f3f29f96-7631-46d4-a7b3-f266da8455c1\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachineScaleSets\",\r\n\
         \  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Compute/virtualMachineScaleSets/pyvmirvm5cc18eb\"\
         ,\r\n  \"name\": \"pyvmirvm5cc18eb\"\r\n}"}
@@ -402,7 +349,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['2007']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:39:47 GMT']
+      date: ['Mon, 10 Sep 2018 23:15:36 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -410,6 +357,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetVMScaleSet3Min;194,Microsoft.Compute/GetVMScaleSet30Min;1494']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetVMScaleSet3Min;197,Microsoft.Compute/GetVMScaleSet30Min;1297']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_vm_implicit_md.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_vm_implicit_md.yaml
index be86c18808b9..9dd31b87b935 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_vm_implicit_md.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_vm_implicit_md.yaml
@@ -2,38 +2,40 @@ interactions:
 - request:
     body: '{"location": "westus", "properties": {"addressSpace": {"addressPrefixes":
       ["10.0.0.0/16"]}, "subnets": [{"properties": {"addressPrefix": "10.0.0.0/24"},
-      "name": "pyvmirsub9bd146b"}]}}'
+      "name": "pyvmirsub9bd146b"}], "enableDdosProtection": false, "enableVmProtection":
+      false}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['183']
+      Content-Length: ['243']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet9bd146b\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b\"\
-        ,\r\n  \"etag\": \"W/\\\"64c083b9-3eb4-4c40-9de7-279cc2a038a1\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"34e29bad-899e-48f0-bce7-11ab6fb6631f\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"036c7e38-bec3-4e4b-86b0-635c5ab9f043\",\r\n    \"\
+        \   \"resourceGuid\": \"b479812b-ffb4-4534-96de-4cdf28391c6a\",\r\n    \"\
         addressSpace\": {\r\n      \"addressPrefixes\": [\r\n        \"10.0.0.0/16\"\
         \r\n      ]\r\n    },\r\n    \"subnets\": [\r\n      {\r\n        \"name\"\
         : \"pyvmirsub9bd146b\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b\"\
-        ,\r\n        \"etag\": \"W/\\\"64c083b9-3eb4-4c40-9de7-279cc2a038a1\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"34e29bad-899e-48f0-bce7-11ab6fb6631f\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Updating\"\
-        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\"\r\n        }\r\n      }\r\
-        \n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
+        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\",\r\n          \"delegations\"\
+        : []\r\n        },\r\n        \"type\": \"Microsoft.Network/virtualNetworks/subnets\"\
+        \r\n      }\r\n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
         : false,\r\n    \"enableVmProtection\": false\r\n  }\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/49860094-50ae-4fac-8f8b-e6f99443b8f3?api-version=2018-02-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2a02ba5f-ec93-47f1-9490-d9e9b6c951df?api-version=2018-07-01']
       cache-control: [no-cache]
-      content-length: ['1176']
+      content-length: ['1268']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:00 GMT']
+      date: ['Mon, 10 Sep 2018 23:15:43 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -47,17 +49,17 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/49860094-50ae-4fac-8f8b-e6f99443b8f3?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2a02ba5f-ec93-47f1-9490-d9e9b6c951df?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"status\": \"InProgress\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['30']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:05 GMT']
+      date: ['Mon, 10 Sep 2018 23:15:46 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -72,17 +74,17 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/49860094-50ae-4fac-8f8b-e6f99443b8f3?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2a02ba5f-ec93-47f1-9490-d9e9b6c951df?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"status\": \"Succeeded\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['29']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:16 GMT']
+      date: ['Mon, 10 Sep 2018 23:15:57 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -97,30 +99,31 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet9bd146b\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b\"\
-        ,\r\n  \"etag\": \"W/\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8b4091e3-d60a-4a51-b2d0-e291bd7475ae\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"036c7e38-bec3-4e4b-86b0-635c5ab9f043\",\r\n    \"\
+        \    \"resourceGuid\": \"b479812b-ffb4-4534-96de-4cdf28391c6a\",\r\n    \"\
         addressSpace\": {\r\n      \"addressPrefixes\": [\r\n        \"10.0.0.0/16\"\
         \r\n      ]\r\n    },\r\n    \"subnets\": [\r\n      {\r\n        \"name\"\
         : \"pyvmirsub9bd146b\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b\"\
-        ,\r\n        \"etag\": \"W/\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"8b4091e3-d60a-4a51-b2d0-e291bd7475ae\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
-        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\"\r\n        }\r\n      }\r\
-        \n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
+        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\",\r\n          \"delegations\"\
+        : []\r\n        },\r\n        \"type\": \"Microsoft.Network/virtualNetworks/subnets\"\
+        \r\n      }\r\n    ],\r\n    \"virtualNetworkPeerings\": [],\r\n    \"enableDdosProtection\"\
         : false,\r\n    \"enableVmProtection\": false\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1178']
+      content-length: ['1270']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:17 GMT']
-      etag: [W/"4719cad4-b57f-41cb-b500-f6bf88d2a39d"]
+      date: ['Mon, 10 Sep 2018 23:15:58 GMT']
+      etag: [W/"8b4091e3-d60a-4a51-b2d0-e291bd7475ae"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -135,23 +138,23 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirsub9bd146b\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b\"\
-        ,\r\n  \"etag\": \"W/\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8b4091e3-d60a-4a51-b2d0-e291bd7475ae\\\"\",\r\n \
         \ \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
-        addressPrefix\": \"10.0.0.0/24\"\r\n  }\r\n}"}
+        addressPrefix\": \"10.0.0.0/24\",\r\n    \"delegations\": []\r\n  },\r\n \
+        \ \"type\": \"Microsoft.Network/virtualNetworks/subnets\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['414']
+      content-length: ['494']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:17 GMT']
-      etag: [W/"4719cad4-b57f-41cb-b500-f6bf88d2a39d"]
+      date: ['Mon, 10 Sep 2018 23:15:59 GMT']
+      etag: [W/"8b4091e3-d60a-4a51-b2d0-e291bd7475ae"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -164,7 +167,7 @@ interactions:
     body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"ipConfigurations":
       [{"properties": {"privateIPAllocationMethod": "Dynamic", "subnet": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b",
       "properties": {"addressPrefix": "10.0.0.0/24", "provisioningState": "Succeeded"},
-      "name": "pyvmirsub9bd146b", "etag": "W/\\\\\\\\\\\\\\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\\\\\\\\\\\\\\""}},
+      "name": "pyvmirsub9bd146b", "etag": "W/\\\\\\\\\\\\\\\\"8b4091e3-d60a-4a51-b2d0-e291bd7475ae\\\\\\\\\\\\\\\\""}},
       "name": "pyarmconfig"}]}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
@@ -172,19 +175,20 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['537']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnic9bd146b\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
-        ,\r\n  \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"a5c5ad1b-f49c-44f0-9287-dfddfdf10231\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"1771de10-75f8-4a87-a1cf-5076fdd3fe5b\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"7d3b447f-f54b-40c3-a3a4-a0df3b65dc70\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"a5c5ad1b-f49c-44f0-9287-dfddfdf10231\\\"\"\
+        ,\r\n        \"type\": \"Microsoft.Network/networkInterfaces/ipConfigurations\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"privateIPAddress\": \"10.0.0.4\",\r\n          \"privateIPAllocationMethod\"\
         : \"Dynamic\",\r\n          \"subnet\": {\r\n            \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b\"\
@@ -192,16 +196,15 @@ interactions:
         : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
         \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
         \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
-        hb5gya4dxzfu3bvqmnofvopqid.dx.internal.cloudapp.net\"\r\n    },\r\n    \"\
-        enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\": false,\r\
-        \n    \"virtualNetworkTapProvisioningState\": \"NotProvisioned\"\r\n  },\r\
-        \n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n}"}
+        foaxtnfu520elfw4jtpsqoi2nc.dx.internal.cloudapp.net\"\r\n    },\r\n    \"\
+        enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\": false\r\
+        \n  },\r\n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/d9b4ae59-1c4a-45f9-98ea-00cded06806b?api-version=2018-02-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/31f6be6e-21b0-4141-99a1-aa4d3beb01ba?api-version=2018-07-01']
       cache-control: [no-cache]
-      content-length: ['1744']
+      content-length: ['1756']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:20 GMT']
+      date: ['Mon, 10 Sep 2018 23:16:00 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -215,17 +218,17 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/d9b4ae59-1c4a-45f9-98ea-00cded06806b?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/31f6be6e-21b0-4141-99a1-aa4d3beb01ba?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"status\": \"Succeeded\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['29']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:51 GMT']
+      date: ['Mon, 10 Sep 2018 23:16:31 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -240,18 +243,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 networkmanagementclient/2.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b?api-version=2018-02-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b?api-version=2018-07-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnic9bd146b\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
-        ,\r\n  \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"a5c5ad1b-f49c-44f0-9287-dfddfdf10231\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"1771de10-75f8-4a87-a1cf-5076fdd3fe5b\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"7d3b447f-f54b-40c3-a3a4-a0df3b65dc70\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"a5c5ad1b-f49c-44f0-9287-dfddfdf10231\\\"\"\
+        ,\r\n        \"type\": \"Microsoft.Network/networkInterfaces/ipConfigurations\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"privateIPAddress\": \"10.0.0.4\",\r\n          \"privateIPAllocationMethod\"\
         : \"Dynamic\",\r\n          \"subnet\": {\r\n            \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/virtualNetworks/pyvmirnet9bd146b/subnets/pyvmirsub9bd146b\"\
@@ -259,16 +263,15 @@ interactions:
         : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
         \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
         \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
-        hb5gya4dxzfu3bvqmnofvopqid.dx.internal.cloudapp.net\"\r\n    },\r\n    \"\
-        enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\": false,\r\
-        \n    \"virtualNetworkTapProvisioningState\": \"NotProvisioned\"\r\n  },\r\
-        \n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n}"}
+        foaxtnfu520elfw4jtpsqoi2nc.dx.internal.cloudapp.net\"\r\n    },\r\n    \"\
+        enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\": false\r\
+        \n  },\r\n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1744']
+      content-length: ['1756']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:52 GMT']
-      etag: [W/"8cfa9197-f4e2-4789-abdd-1d71c60abbd8"]
+      date: ['Mon, 10 Sep 2018 23:16:31 GMT']
+      etag: [W/"a5c5ad1b-f49c-44f0-9287-dfddfdf10231"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -290,13 +293,13 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['610']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"dd43a2c6-e917-4963-9198-19f395b8b6d5\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -315,11 +318,11 @@ interactions:
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b\"\
         ,\r\n  \"name\": \"pyvmirvm9bd146b\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/853191e6-e8d9-4b0a-87ce-2e680ec27262?api-version=2018-06-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['1441']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:31:55 GMT']
+      date: ['Mon, 10 Sep 2018 23:16:32 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -334,47 +337,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/853191e6-e8d9-4b0a-87ce-2e680ec27262?api-version=2018-06-01
-  response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:31:55.1845156+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"853191e6-e8d9-4b0a-87ce-2e680ec27262\"\
-        \r\n}"}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['134']
-      content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:32:05 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      transfer-encoding: [chunked]
-      vary: [Accept-Encoding]
-      x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14999,Microsoft.Compute/GetOperation30Min;29996']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/853191e6-e8d9-4b0a-87ce-2e680ec27262?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:31:55.1845156+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"853191e6-e8d9-4b0a-87ce-2e680ec27262\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:16:33.5051142+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:32:36 GMT']
+      date: ['Mon, 10 Sep 2018 23:16:43 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -382,7 +357,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14996,Microsoft.Compute/GetOperation30Min;29993']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29988']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -390,19 +365,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/853191e6-e8d9-4b0a-87ce-2e680ec27262?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:31:55.1845156+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"853191e6-e8d9-4b0a-87ce-2e680ec27262\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:16:33.5051142+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:33:08 GMT']
+      date: ['Mon, 10 Sep 2018 23:17:14 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -410,7 +385,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14993,Microsoft.Compute/GetOperation30Min;29990']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29985']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -418,19 +393,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/853191e6-e8d9-4b0a-87ce-2e680ec27262?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:31:55.1845156+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"853191e6-e8d9-4b0a-87ce-2e680ec27262\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:16:33.5051142+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:33:42 GMT']
+      date: ['Mon, 10 Sep 2018 23:17:45 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -438,7 +413,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14990,Microsoft.Compute/GetOperation30Min;29987']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29982']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -446,19 +421,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/853191e6-e8d9-4b0a-87ce-2e680ec27262?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:31:55.1845156+00:00\",\r\
-        \n  \"endTime\": \"2018-07-20T19:33:52.6089944+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"853191e6-e8d9-4b0a-87ce-2e680ec27262\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:16:33.5051142+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:18:08.0550254+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"2b68f9e8-b9e9-4110-b1f8-7f629d7d71dc\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:34:12 GMT']
+      date: ['Mon, 10 Sep 2018 23:18:16 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -466,7 +441,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29985']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29978']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -474,21 +449,21 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"dd43a2c6-e917-4963-9198-19f395b8b6d5\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"16.04.0-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
+        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b\"\
         ,\r\n        \"createOption\": \"FromImage\",\r\n        \"caching\": \"ReadWrite\"\
         ,\r\n        \"managedDisk\": {\r\n          \"storageAccountType\": \"Standard_LRS\"\
-        ,\r\n          \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
+        ,\r\n          \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b\"\
         \r\n        },\r\n        \"diskSizeGB\": 30\r\n      },\r\n      \"dataDisks\"\
         : []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\": \"test\"\
         ,\r\n      \"adminUsername\": \"Foo12\",\r\n      \"linuxConfiguration\":\
@@ -504,7 +479,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['1784']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:34:13 GMT']
+      date: ['Mon, 10 Sep 2018 23:18:16 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -512,7 +487,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4196,Microsoft.Compute/LowCostGet30Min;33584']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;3994,Microsoft.Compute/LowCostGet30Min;31994']
     status: {code: 200, message: OK}
 - request:
     body: '{"location": "westus", "properties": {"creationData": {"createOption":
@@ -523,29 +498,29 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['99']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"provisioningState\"\
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"mySecondDisk\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/138dc38a-a6be-4be9-abc1-cf8e7afe6dbd?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/7fd39c3f-ba06-489f-8c84-338de1c5ff7c?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['230']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:34:14 GMT']
+      date: ['Mon, 10 Sep 2018 23:18:17 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/138dc38a-a6be-4be9-abc1-cf8e7afe6dbd?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/7fd39c3f-ba06-489f-8c84-338de1c5ff7c?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;998,Microsoft.Compute/CreateUpdateDisks30Min;3998']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;998,Microsoft.Compute/CreateUpdateDisks30Min;3995']
       x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 202, message: Accepted}
 - request:
@@ -554,25 +529,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/138dc38a-a6be-4be9-abc1-cf8e7afe6dbd?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/7fd39c3f-ba06-489f-8c84-338de1c5ff7c?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:34:15.0985166+00:00\",\r\
-        \n  \"endTime\": \"2018-07-20T19:34:15.3016555+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:18:18.6233051+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:18:18.7483164+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-07-20T19:34:15.0985166+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:18:18.6233051+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk\"\
-        ,\"name\":\"mySecondDisk\"}\r\n  },\r\n  \"name\": \"138dc38a-a6be-4be9-abc1-cf8e7afe6dbd\"\
+        ,\"name\":\"mySecondDisk\"}\r\n  },\r\n  \"name\": \"7fd39c3f-ba06-489f-8c84-338de1c5ff7c\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['706']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:34:45 GMT']
+      date: ['Mon, 10 Sep 2018 23:18:48 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -580,7 +555,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49996,Microsoft.Compute/GetOperation30Min;249994']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49998,Microsoft.Compute/GetOperation30Min;249982']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -588,15 +563,15 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-07-20T19:34:15.0985166+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:18:18.6233051+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk\"\
@@ -605,7 +580,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['585']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:34:46 GMT']
+      date: ['Mon, 10 Sep 2018 23:18:49 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -613,15 +588,15 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4997,Microsoft.Compute/LowCostGet30Min;19996']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4997,Microsoft.Compute/LowCostGet30Min;19983']
     status: {code: 200, message: OK}
 - request:
     body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"hardwareProfile":
       {"vmSize": "Standard_A0"}, "storageProfile": {"imageReference": {"publisher":
       "Canonical", "offer": "UbuntuServer", "sku": "16.04.0-LTS", "version": "latest"},
-      "osDisk": {"osType": "Linux", "name": "pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837",
+      "osDisk": {"osType": "Linux", "name": "pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b",
       "caching": "ReadWrite", "createOption": "FromImage", "diskSizeGB": 30, "managedDisk":
-      {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837",
+      {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b",
       "storageAccountType": "Standard_LRS"}}, "dataDisks": [{"lun": 12, "name": "mySecondDisk",
       "createOption": "Attach", "managedDisk": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk"}}]},
       "osProfile": {"computerName": "test", "adminUsername": "Foo12", "linuxConfiguration":
@@ -634,22 +609,22 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['1392']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"dd43a2c6-e917-4963-9198-19f395b8b6d5\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"16.04.0-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
+        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b\"\
         ,\r\n        \"createOption\": \"FromImage\",\r\n        \"caching\": \"ReadWrite\"\
         ,\r\n        \"managedDisk\": {\r\n          \"storageAccountType\": \"Standard_LRS\"\
-        ,\r\n          \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
+        ,\r\n          \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b\"\
         \r\n        },\r\n        \"diskSizeGB\": 30\r\n      },\r\n      \"dataDisks\"\
         : [\r\n        {\r\n          \"lun\": 12,\r\n          \"name\": \"mySecondDisk\"\
         ,\r\n          \"createOption\": \"Attach\",\r\n          \"caching\": \"\
@@ -667,11 +642,11 @@ interactions:
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b\"\
         ,\r\n  \"name\": \"pyvmirvm9bd146b\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/ab33f265-1de6-4e43-bf2e-9a5a04d089c4?api-version=2018-06-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7f1deff1-e630-432d-ac68-33245bcea8ff?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['2251']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:34:48 GMT']
+      date: ['Mon, 10 Sep 2018 23:18:51 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -679,7 +654,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/PutVM3Min;239,Microsoft.Compute/PutVM30Min;1198']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/PutVM3Min;238,Microsoft.Compute/PutVM30Min;1198']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
@@ -688,19 +663,19 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/ab33f265-1de6-4e43-bf2e-9a5a04d089c4?api-version=2018-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7f1deff1-e630-432d-ac68-33245bcea8ff?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:34:48.8166067+00:00\",\r\
-        \n  \"endTime\": \"2018-07-20T19:35:03.2205728+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"ab33f265-1de6-4e43-bf2e-9a5a04d089c4\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:18:51.0112257+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:18:56.6220269+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"7f1deff1-e630-432d-ac68-33245bcea8ff\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:35:19 GMT']
+      date: ['Mon, 10 Sep 2018 23:19:21 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -708,7 +683,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14989,Microsoft.Compute/GetOperation30Min;29986']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29975']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -716,21 +691,21 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.4
-          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"dd43a2c6-e917-4963-9198-19f395b8b6d5\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"16.04.0-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
+        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b\"\
         ,\r\n        \"createOption\": \"FromImage\",\r\n        \"caching\": \"ReadWrite\"\
         ,\r\n        \"managedDisk\": {\r\n          \"storageAccountType\": \"Standard_LRS\"\
-        ,\r\n          \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
+        ,\r\n          \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/pyvmirvm9bd146b_OsDisk_1_9427850e11d1422a8609005083b0018b\"\
         \r\n        },\r\n        \"diskSizeGB\": 30\r\n      },\r\n      \"dataDisks\"\
         : [\r\n        {\r\n          \"lun\": 12,\r\n          \"name\": \"mySecondDisk\"\
         ,\r\n          \"createOption\": \"Attach\",\r\n          \"caching\": \"\
@@ -751,7 +726,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['2252']
       content-type: [application/json; charset=utf-8]
-      date: ['Fri, 20 Jul 2018 19:35:20 GMT']
+      date: ['Mon, 10 Sep 2018 23:19:22 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -759,6 +734,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4191,Microsoft.Compute/LowCostGet30Min;33582']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;3989,Microsoft.Compute/LowCostGet30Min;31989']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_empty_md.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_empty_md.yaml
index f0c05fbb0216..bf6f9841f94a 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_empty_md.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_empty_md.yaml
@@ -8,30 +8,30 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['99']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_empty_md20c90f2a/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_empty_md20c90f2a/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"provisioningState\"\
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"my_disk_name\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/d4c4e808-18e8-4b91-a1e2-59512b3ff60d?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/5c4a08f1-d800-4520-a825-721e258c3725?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['230']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:30:03 GMT']
+      date: ['Mon, 10 Sep 2018 23:19:29 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/d4c4e808-18e8-4b91-a1e2-59512b3ff60d?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/5c4a08f1-d800-4520-a825-721e258c3725?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;998,Microsoft.Compute/CreateUpdateDisks30Min;3994']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;997,Microsoft.Compute/CreateUpdateDisks30Min;3994']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -39,25 +39,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/d4c4e808-18e8-4b91-a1e2-59512b3ff60d?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/5c4a08f1-d800-4520-a825-721e258c3725?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:30:04.0463126+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:30:04.2962841+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:19:29.8435248+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:19:29.9841198+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:30:04.0463126+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:19:29.8435248+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_empty_md20c90f2a/providers/Microsoft.Compute/disks/my_disk_name\"\
-        ,\"name\":\"my_disk_name\"}\r\n  },\r\n  \"name\": \"d4c4e808-18e8-4b91-a1e2-59512b3ff60d\"\
+        ,\"name\":\"my_disk_name\"}\r\n  },\r\n  \"name\": \"5c4a08f1-d800-4520-a825-721e258c3725\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['694']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:30:34 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:00 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -65,7 +65,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49996,Microsoft.Compute/GetOperation30Min;249976']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49996,Microsoft.Compute/GetOperation30Min;249980']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -73,15 +73,15 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_empty_md20c90f2a/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_empty_md20c90f2a/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:30:04.0463126+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:19:29.8435248+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_empty_md20c90f2a/providers/Microsoft.Compute/disks/my_disk_name\"\
@@ -90,7 +90,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['573']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:30:34 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:00 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -98,6 +98,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4995,Microsoft.Compute/LowCostGet30Min;19985']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4994,Microsoft.Compute/LowCostGet30Min;19979']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks.yaml
index 6ae508a69dfb..af1b5ef9bd9e 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks.yaml
@@ -5,19 +5,18 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_list_disks403a1004/providers/Microsoft.Compute/disks?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_list_disks403a1004/providers/Microsoft.Compute/disks?api-version=2018-06-01
   response:
     body: {string: '{"value":[]}'}
     headers:
       cache-control: [no-cache]
       content-length: ['12']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:30:41 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:06 GMT']
       expires: ['-1']
       pragma: [no-cache]
       strict-transport-security: [max-age=31536000; includeSubDomains]
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks_fake.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks_fake.yaml
index 1defa202893b..02273e99cfd4 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks_fake.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_list_disks_fake.yaml
@@ -5,12 +5,11 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/fakename/providers/Microsoft.Compute/disks?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/fakename/providers/Microsoft.Compute/disks?api-version=2018-06-01
   response:
     body: {string: '{"error":{"code":"ResourceGroupNotFound","message":"Resource group
         ''fakename'' could not be found."}}'}
@@ -18,7 +17,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['100']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:30:45 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:10 GMT']
       expires: ['-1']
       pragma: [no-cache]
       strict-transport-security: [max-age=31536000; includeSubDomains]
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_md_id.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_md_id.yaml
index 15b78c41d850..a2c42a4c121b 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_md_id.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_md_id.yaml
@@ -8,24 +8,24 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['99']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"provisioningState\"\
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"myImageDisk\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/90a1fad3-dead-4667-b592-ae439b1477c8?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f46b81d1-17a5-419d-b4cb-6bcf1af63fbc?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['229']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:30:52 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:15 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/90a1fad3-dead-4667-b592-ae439b1477c8?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f46b81d1-17a5-419d-b4cb-6bcf1af63fbc?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
@@ -39,25 +39,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/90a1fad3-dead-4667-b592-ae439b1477c8?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f46b81d1-17a5-419d-b4cb-6bcf1af63fbc?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:30:52.136535+00:00\",\r\n\
-        \  \"endTime\": \"2018-03-21T21:30:52.292763+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:20:15.9785179+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:20:16.1053974+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:30:52.1521389+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:20:15.9785179+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk\"\
-        ,\"name\":\"myImageDisk\"}\r\n  },\r\n  \"name\": \"90a1fad3-dead-4667-b592-ae439b1477c8\"\
+        ,\"name\":\"myImageDisk\"}\r\n  },\r\n  \"name\": \"f46b81d1-17a5-419d-b4cb-6bcf1af63fbc\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['695']
+      content-length: ['697']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:31:21 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:45 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -65,7 +65,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49994,Microsoft.Compute/GetOperation30Min;249974']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49994,Microsoft.Compute/GetOperation30Min;249978']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -73,15 +73,15 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:30:52.1521389+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:20:15.9785179+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk\"\
@@ -90,7 +90,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['576']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:31:23 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:46 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -98,7 +98,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4991,Microsoft.Compute/LowCostGet30Min;19981']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4990,Microsoft.Compute/LowCostGet30Min;19975']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -106,17 +106,16 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:30:52.1521389+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:20:15.9785179+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk\"\
@@ -125,7 +124,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['576']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:31:23 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:47 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -133,22 +132,22 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4990,Microsoft.Compute/LowCostGet30Min;19980']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4989,Microsoft.Compute/LowCostGet30Min;19974']
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"creationData": {"createOption":
-      "Copy", "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk"}}}\\\''\'''''
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"creationData":
+      {"createOption": "Copy", "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk"}}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['267']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Copy\",\r\n      \"sourceResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk\"\
@@ -156,13 +155,13 @@ interactions:
         : true\r\n  },\r\n  \"location\": \"westus\",\r\n  \"name\": \"my_disk_name\"\
         \r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fb849fb2-8666-453a-be4d-1117e1e7646d?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f180adf0-c9b5-499c-a2d2-855cf5fc60c9?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['400']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:31:25 GMT']
+      date: ['Mon, 10 Sep 2018 23:20:48 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fb849fb2-8666-453a-be4d-1117e1e7646d?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f180adf0-c9b5-499c-a2d2-855cf5fc60c9?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
@@ -176,26 +175,26 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/fb849fb2-8666-453a-be4d-1117e1e7646d?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f180adf0-c9b5-499c-a2d2-855cf5fc60c9?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:31:25.4940287+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:31:26.1754808+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:20:49.1128609+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:20:50.0503913+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
         :{\"createOption\":\"Copy\",\"sourceResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk\"\
-        },\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:31:25.4940287+00:00\"\
+        },\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:20:49.1285052+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/my_disk_name\"\
-        ,\"name\":\"my_disk_name\"}\r\n  },\r\n  \"name\": \"fb849fb2-8666-453a-be4d-1117e1e7646d\"\
+        ,\"name\":\"my_disk_name\"}\r\n  },\r\n  \"name\": \"f180adf0-c9b5-499c-a2d2-855cf5fc60c9\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['883']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:31:55 GMT']
+      date: ['Mon, 10 Sep 2018 23:21:18 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -203,7 +202,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49991,Microsoft.Compute/GetOperation30Min;249971']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49991,Microsoft.Compute/GetOperation30Min;249975']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -211,16 +210,16 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Copy\",\r\n      \"sourceResourceId\": \"\
         /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/myImageDisk\"\
-        \r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"timeCreated\": \"2018-03-21T21:31:25.4940287+00:00\"\
+        \r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"timeCreated\": \"2018-09-10T23:20:49.1285052+00:00\"\
         ,\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_md_id7177110b/providers/Microsoft.Compute/disks/my_disk_name\"\
@@ -229,7 +228,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['771']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:31:56 GMT']
+      date: ['Mon, 10 Sep 2018 23:21:20 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -237,6 +236,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4987,Microsoft.Compute/LowCostGet30Min;19977']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4986,Microsoft.Compute/LowCostGet30Min;19971']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_storage_blob.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_storage_blob.yaml
index 756a9cf61e78..a83674ffe496 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_storage_blob.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_md_from_storage_blob.yaml
@@ -13,20 +13,20 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [661f000a-5d38-11e7-865b-ecb1d756380e]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_storage_blobf5ab1401/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_storage_blobf5ab1401/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"createOption\":
         \"Import\",\r\n      \"sourceUri\": \"https://mystorageaccount.blob.core.windows.net/inputtestdatadonotdelete/ubuntu.vhd\"\r\n
         \   },\r\n    \"provisioningState\": \"Updating\",\r\n    \"isArmResource\":
         true\r\n  },\r\n  \"location\": \"westus\"\r\n}"}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0f24271a-d4a7-44a3-b2bd-adbd304fef23?api-version=2018-04-01']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0f24271a-d4a7-44a3-b2bd-adbd304fef23?api-version=2018-06-01']
       Cache-Control: [no-cache]
       Content-Length: ['290']
       Content-Type: [application/json; charset=utf-8]
       Date: ['Fri, 30 Jun 2017 02:04:07 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0f24271a-d4a7-44a3-b2bd-adbd304fef23?monitor=true&api-version=2018-04-01']
+      Location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0f24271a-d4a7-44a3-b2bd-adbd304fef23?monitor=true&api-version=2018-06-01']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -48,7 +48,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [661f000a-5d38-11e7-865b-ecb1d756380e]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0f24271a-d4a7-44a3-b2bd-adbd304fef23?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/0f24271a-d4a7-44a3-b2bd-adbd304fef23?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"startTime\": \"2017-06-30T02:04:06.8961345+00:00\",\r\n
         \ \"endTime\": \"2017-06-30T02:04:07.7398687+00:00\",\r\n  \"status\": \"Succeeded\",\r\n
@@ -83,7 +83,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [661f000a-5d38-11e7-865b-ecb1d756380e]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_storage_blobf5ab1401/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_md_from_storage_blobf5ab1401/providers/Microsoft.Compute/disks/my_disk_name?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"tier\":
         \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\": {\r\n
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_resize_md.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_resize_md.yaml
index f14b47b95d35..36eb85aef5f3 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_resize_md.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_resize_md.yaml
@@ -8,24 +8,24 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['99']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"creationData\": {\r\n      \"\
         createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\": 20,\r\n    \"provisioningState\"\
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"myDisk\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/24116125-9ce7-48e8-83fa-f13627f8c73c?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/dbdf2a97-cf42-4cc5-bf7b-d7451a63bd73?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['224']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:32:11 GMT']
+      date: ['Mon, 10 Sep 2018 23:21:33 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/24116125-9ce7-48e8-83fa-f13627f8c73c?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/dbdf2a97-cf42-4cc5-bf7b-d7451a63bd73?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
@@ -39,25 +39,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/24116125-9ce7-48e8-83fa-f13627f8c73c?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/dbdf2a97-cf42-4cc5-bf7b-d7451a63bd73?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:32:11.8178207+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:32:11.9740591+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:21:34.4331292+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:21:34.5893633+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:32:11.8178207+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-09-10T23:21:34.4487541+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk\"\
-        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"24116125-9ce7-48e8-83fa-f13627f8c73c\"\
+        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"dbdf2a97-cf42-4cc5-bf7b-d7451a63bd73\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['683']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:32:42 GMT']
+      date: ['Mon, 10 Sep 2018 23:22:04 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -65,7 +65,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49990,Microsoft.Compute/GetOperation30Min;249968']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49990,Microsoft.Compute/GetOperation30Min;249972']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -73,15 +73,15 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:32:11.8178207+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:21:34.4487541+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk\"\
@@ -90,7 +90,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['562']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:32:42 GMT']
+      date: ['Mon, 10 Sep 2018 23:22:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -98,7 +98,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4985,Microsoft.Compute/LowCostGet30Min;19972']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4985,Microsoft.Compute/LowCostGet30Min;19966']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -106,17 +106,16 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 20,\r\n    \"timeCreated\": \"2018-03-21T21:32:11.8178207+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-09-10T23:21:34.4487541+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk\"\
@@ -125,7 +124,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['562']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:32:43 GMT']
+      date: ['Mon, 10 Sep 2018 23:22:06 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -133,7 +132,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4984,Microsoft.Compute/LowCostGet30Min;19971']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4984,Microsoft.Compute/LowCostGet30Min;19965']
     status: {code: 200, message: OK}
 - request:
     body: '{"location": "westus", "sku": {"name": "Standard_LRS"}, "properties": {"creationData":
@@ -144,11 +143,11 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['132']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\"\r\n  },\r\n\
         \  \"properties\": {\r\n    \"creationData\": {\r\n      \"createOption\"\
@@ -156,19 +155,19 @@ interactions:
         : \"Updating\",\r\n    \"isArmResource\": true\r\n  },\r\n  \"location\":\
         \ \"westus\",\r\n  \"name\": \"myDisk\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/1ec43e68-ba46-486b-b034-81f5fbd4189d?api-version=2018-04-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f6435848-f5fa-40e6-8d7e-d8c8f1ceaba6?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['270']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:32:44 GMT']
+      date: ['Mon, 10 Sep 2018 23:22:07 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/1ec43e68-ba46-486b-b034-81f5fbd4189d?monitor=true&api-version=2018-04-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f6435848-f5fa-40e6-8d7e-d8c8f1ceaba6?monitor=true&api-version=2018-06-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;994,Microsoft.Compute/CreateUpdateDisks30Min;3989']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;995,Microsoft.Compute/CreateUpdateDisks30Min;3989']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -176,25 +175,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/1ec43e68-ba46-486b-b034-81f5fbd4189d?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/f6435848-f5fa-40e6-8d7e-d8c8f1ceaba6?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:32:45.0010506+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:32:45.1307564+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-09-10T23:22:07.6915948+00:00\",\r\
+        \n  \"endTime\": \"2018-09-10T23:22:07.8790662+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":25,\"timeCreated\":\"2018-03-21T21:32:11.8178207+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":25,\"timeCreated\":\"2018-09-10T23:21:34.4487541+00:00\"\
         ,\"provisioningState\":\"Succeeded\",\"diskState\":\"Unattached\"},\"type\"\
         :\"Microsoft.Compute/disks\",\"location\":\"westus\",\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk\"\
-        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"1ec43e68-ba46-486b-b034-81f5fbd4189d\"\
+        ,\"name\":\"myDisk\"}\r\n  },\r\n  \"name\": \"f6435848-f5fa-40e6-8d7e-d8c8f1ceaba6\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['683']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:33:15 GMT']
+      date: ['Mon, 10 Sep 2018 23:22:38 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -202,7 +201,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49987,Microsoft.Compute/GetOperation30Min;249964']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49987,Microsoft.Compute/GetOperation30Min;249968']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -210,15 +209,15 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      User-Agent: [python/3.6.4 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.26
-          msrest_azure/0.4.20 computemanagementclient/4.0.0rc1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.19.1 msrest/0.5.5
+          msrest_azure/0.5.0 computemanagementclient/4.1.0 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-04-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_LRS\",\r\n    \"\
         tier\": \"Standard\"\r\n  },\r\n  \"properties\": {\r\n    \"creationData\"\
         : {\r\n      \"createOption\": \"Empty\"\r\n    },\r\n    \"diskSizeGB\":\
-        \ 25,\r\n    \"timeCreated\": \"2018-03-21T21:32:11.8178207+00:00\",\r\n \
+        \ 25,\r\n    \"timeCreated\": \"2018-09-10T23:21:34.4487541+00:00\",\r\n \
         \   \"provisioningState\": \"Succeeded\",\r\n    \"diskState\": \"Unattached\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/disks\",\r\n  \"location\": \"\
         westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_resize_md30640f8d/providers/Microsoft.Compute/disks/myDisk\"\
@@ -227,7 +226,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['562']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:33:15 GMT']
+      date: ['Mon, 10 Sep 2018 23:22:38 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -235,6 +234,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4983,Microsoft.Compute/LowCostGet30Min;19969']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4981,Microsoft.Compute/LowCostGet30Min;19961']
     status: {code: 200, message: OK}
 version: 1